• Home
  • History
  • Annotate
  • only in /external/chromium_org/content/public/test/
History log of /external/chromium_org/content/public/test/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
27bf38b1f54481a4168f6630e5b71bed9dd803c6 03-Dec-2014 Hui Shu <hush@google.com> Cherry pick: Detect if we're using browser composior in RWHVA

Cherry pick from:
https://crrev.com/a43a08a85da0a2d2ed78a850fa9f8efe8c0028b9

Original description:
Detecting if we're using synchronous compositor is unreliable because
the synchronous compositor could be created either before or after
RWHVA constructor.

Instead, we can detect if we're using browser compositor in RWHVA. And
this can be done reliably at RWHVA construction time.

Conflicts:
content/test/run_all_unittests.cc,
content/browser/renderer_host/render_widget_host_view_android.cc

BUG: 18377042
Change-Id: I5ad377de0c8651a76eb51776eca7e7ad3fd3e9cd
ontent_test_suite_base.cc
e578b2d213c837aab9cea5407d30f5c84065cd0e 12-Nov-2014 Marcin Kosiba <mkosiba@google.com> Cherry-pick: Pass the size to the RenderView on creation.

The size update races with the page load creating the opportunity
for the page to observe the initial (0,0) renderer size. This patch
addresses the issue by sending the initial size together with the
RenderView creation request.

BUG=424205

Review URL: https://codereview.chromium.org/659093002

Cr-Commit-Position: refs/heads/master@{#303775}

Conflicts:
chrome/test/data/extensions/platform_apps/web_view/shim/main.js
content/browser/renderer_host/render_widget_host_unittest.cc

BUG: 17892238
Change-Id: I11dca7e962421d46734d2122ec79bc501a2db09d
ender_view_test.cc
ender_view_test.h
1320f92c476a1ad9d19dba2a48c72b75566198e9 30-Sep-2014 Primiano Tucci <primiano@google.com> Merge from Chromium at DEPS revision 267aeeb8d85c

This commit was generated by merge_to_master.py.

Change-Id: Id3aac9713b301fae64408cdaee0888724eeb7c0e
ndroid/BUILD.gn
ndroid/javatests/src/org/chromium/content/browser/test/util/HistoryUtils.java
sync_file_test_helper.cc
sync_file_test_helper.h
rowser_test_base.cc
rowser_test_utils.cc
ontent_test_suite_base.cc
rame_load_waiter.cc
rame_load_waiter.h
ayouttest_support.h
ock_blob_url_request_context.cc
ock_download_item.h
ock_render_process_host.cc
ock_render_process_host.h
ock_resource_context.cc
ock_resource_context.h
ock_special_storage_policy.h
ock_storage_client.cc
ock_storage_client.h
ender_view_test.cc
ender_widget_test.cc
andbox_file_system_test_helper.cc
andbox_file_system_test_helper.h
est_browser_context.cc
est_browser_thread_bundle.cc
est_file_system_backend.cc
est_file_system_backend.h
est_file_system_context.cc
est_file_system_context.h
est_file_system_options.h
est_launcher.cc
est_renderer_host.cc
est_renderer_host.h
eb_contents_tester.h
03b57e008b61dfcb1fbad3aea950ae0e001748b0 28-Aug-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 291560

This commit was generated by merge_to_master.py.

Change-Id: Ic58269055810d51286b4109e59b90b6856887a30
ndroid/javatests/src/org/chromium/content/browser/test/util/DOMUtils.java
sync_file_test_helper.cc
sync_file_test_helper.h
rowser_test_utils.cc
rowser_test_utils.h
ayouttest_support.h
ock_blob_url_request_context.cc
ock_blob_url_request_context.h
ock_special_storage_policy.h
ock_storage_client.cc
ock_storage_client.h
ender_view_test.cc
ender_widget_test.cc
andbox_file_system_test_helper.cc
andbox_file_system_test_helper.h
est_browser_context.cc
est_browser_context.h
est_file_system_backend.cc
est_file_system_backend.h
est_file_system_context.cc
est_file_system_context.h
est_file_system_options.cc
est_file_system_options.h
6e8cce623b6e4fe0c9e4af605d675dd9d0338c38 19-Aug-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 290040

This commit was generated by merge_to_master.py.

Change-Id: I694ec52d1e0b553f163c2faf4373d63270ab1aac
ndroid/javatests/src/org/chromium/content/browser/test/NestedSystemMessageHandler.java
ndroid/javatests/src/org/chromium/content/browser/test/util/MockLocationProvider.java
ndroid/javatests/src/org/chromium/content/browser/test/util/TestCallbackHelperContainer.java
rowser_test_base.cc
rowser_test_utils.cc
ender_view_test.cc
est_launcher.cc
est_renderer_host.cc
est_renderer_host.h
eb_contents_tester.h
5f1c94371a64b3196d4be9466099bb892df9b88e 12-Aug-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 288042

This commit was generated by merge_to_master.py.

Change-Id: I583602ff16d735199f1810565c9296e970ce2854
ndroid/javatests/src/org/chromium/content/browser/test/NestedSystemMessageHandler.java
rowser_test_base.cc
rowser_test_utils.cc
ock_blob_url_request_context.cc
est_browser_context.cc
est_browser_context.h
est_utils.h
116680a4aac90f2aa7413d9095a592090648e557 21-Jul-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 284076

This commit was generated by merge_to_master.py.

Change-Id: I9a279485b02fe7ceddcd32d992a714ff132e99ae
ndroid/OWNERS
ndroid/javatests/src/org/chromium/content/browser/test/util/DOMUtils.java
ndroid/javatests/src/org/chromium/content/browser/test/util/TestContentViewClientWrapper.java
rowser_test_utils.cc
rowser_test_utils.h
ontent_browser_test_utils.cc
ontent_browser_test_utils.h
ontent_test_suite_base.cc
ayouttest_support.h
ock_render_process_host.cc
ock_render_process_host.h
ock_render_thread.cc
ock_render_thread.h
ender_view_test.cc
est_renderer_host.cc
est_renderer_host.h
est_utils.cc
est_utils.h
eb_contents_tester.h
6d86b77056ed63eb6871182f42a9fd5f07550f90 25-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 278856

This commit was generated by merge_to_master.py.

Change-Id: If3807744d3e5d3ee84b897bd2d099a2b7ed2e7a3
ndroid/javatests/src/org/chromium/content/browser/test/util/TestCallbackHelperContainer.java
ndroid/javatests/src/org/chromium/content/browser/test/util/TestWebContentsObserver.java
rowser_test_base.cc
ontent_browser_test.cc
ayouttest_support.h
andbox_file_system_test_helper.cc
est_file_system_backend.cc
f8ee788a64d60abd8f2d742a5fdedde054ecd910 20-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 278205

This commit was generated by merge_to_master.py.

Change-Id: I23f1e7ea8c154ba72e7fb594436216f861f868ab
ndroid/javatests/src/org/chromium/content/browser/test/util/DOMUtils.java
rowser_test_base.cc
ontent_browser_test.cc
ayouttest_support.h
ock_download_manager.cc
ock_download_manager.h
est_browser_context.cc
est_browser_context.h
est_launcher.cc
46d4c2bc3267f3f028f39e7e311b0f89aba2e4fd 09-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 275586

This commit was generated by merge_to_master.py.

Change-Id: Ief3a0ffd810858bfddbe0ec5931e3ee90d53f78c
rowser_test_base.cc
rowser_test_base.h
rowser_test_utils.cc
ayouttest_support.h
ock_render_process_host.cc
ock_render_process_host.h
est_renderer_host.cc
cedac228d2dd51db4b79ea1e72c7f249408ee061 03-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 273901

This commit was generated by merge_to_master.py.

Change-Id: I45745444894df927ffc1045ab8de88b9e52636a3
rowser_test_utils.cc
rowser_test_utils.h
ontent_browser_test.cc
ontent_browser_test_utils.cc
ontent_browser_test_utils.h
avascript_test_observer.cc
avascript_test_observer.h
ayouttest_support.h
ock_download_item.cc
ock_download_item.h
ock_render_process_host.cc
ock_render_process_host.h
ock_render_thread.cc
ender_view_test.cc
ender_view_test.h
est_browser_context.cc
est_browser_context.h
est_renderer_host.cc
est_renderer_host.h
nittest_test_suite.cc
nittest_test_suite.h
010d83a9304c5a91596085d917d248abff47903a 14-May-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 269336

This commit was generated by merge_to_master.py.

Change-Id: I8b9c77f10eccd2a8b4c7ce373ffda18568af54ff
ndroid/javatests/src/org/chromium/content/browser/test/util/DOMUtils.java
rowser_test_base.cc
rowser_test_utils.cc
rowser_test_utils.h
ayouttest_support.h
ender_view_test.cc
ender_widget_test.cc
est_browser_context.cc
est_browser_context.h
est_navigation_observer.cc
5c02ac1a9c1b504631c0a3d2b6e737b5d738bae1 01-May-2014 Bo Liu <boliu@google.com> Merge from Chromium at DEPS revision 267519

This commit was generated by merge_to_master.py.

Change-Id: I6002987b71e09742c68bad9c834ae800ff531f25
ontent_test_suite_base.cc
ayouttest_support.h
ock_render_process_host.cc
ock_render_process_host.h
ock_render_thread.cc
ock_render_thread.h
ock_special_storage_policy.cc
ock_special_storage_policy.h
ender_view_test.cc
ender_view_test.h
andbox_file_system_test_helper.cc
est_file_system_context.cc
est_navigation_observer.cc
est_navigation_observer.h
est_renderer_host.cc
0529e5d033099cbfc42635f6f6183833b09dff6e 24-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 265802

This commit was generated by merge_to_master.py.

Change-Id: I6fac2dbbce472b18ca943b6e6f247835b0bd6281
ndroid/javatests/src/org/chromium/content/browser/test/util/DOMUtils.java
ndroid/javatests/src/org/chromium/content/browser/test/util/HistoryUtils.java
ndroid/javatests/src/org/chromium/content/browser/test/util/TestCallbackHelperContainer.java
rowser_test_base.cc
ontent_browser_test_utils.cc
ontent_browser_test_utils.h
ontent_test_suite_base.cc
ayouttest_support.h
ock_storage_client.cc
ock_storage_client.h
ender_view_test.cc
ender_widget_test.cc
est_renderer_host.h
a02191e04bc25c4935f804f2c080ae28663d096d 16-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 263965

This commit was generated by merge_to_master.py.

Change-Id: Ia1121eddd985123f160afde6372525c3d25975bf
ndroid/javatests/src/org/chromium/content/browser/test/util/CriteriaHelper.java
ndroid/javatests/src/org/chromium/content/browser/test/util/TestCallbackHelperContainer.java
ock_render_process_host.cc
ender_view_test.cc
ender_view_test.h
est_file_error_injector.cc
c5cede9ae108bb15f6b7a8aea21c7e1fefa2834c 10-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 262940

This commit was generated by merge_to_master.py.

Change-Id: I9a3fddbb29857fa8f68a18c6a0115862b65f84d1
ndroid/javatests/src/org/chromium/content/browser/test/util/DOMUtils.java
ndroid/javatests/src/org/chromium/content/browser/test/util/JavaScriptUtils.java
ndroid/javatests/src/org/chromium/content/browser/test/util/TestCallbackHelperContainer.java
ndroid/javatests/src/org/chromium/content/browser/test/util/TestContentViewClient.java
ndroid/javatests/src/org/chromium/content/browser/test/util/TestContentViewClientWrapper.java
rowser_test_utils.cc
ontent_browser_test_utils.cc
ock_render_thread.cc
ock_render_thread.h
ender_view_test.cc
ender_view_test.h
effb81e5f8246d0db0270817048dc992db66e9fb 31-Mar-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 260458

This commit was generated by merge_to_master.py.

Change-Id: I140fa91b7f09c8efba4424e99ccb87b94a11d022
rowser_test_utils.cc
rowser_test_utils.h
ontent_browser_test.cc
ontent_browser_test.h
ontent_browser_test_utils.cc
ontent_browser_test_utils.h
ontent_browser_test_utils_mac.mm
ayouttest_support.h
ock_download_item.h
est_browser_context.cc
est_browser_context.h
23730a6e56a168d1879203e4b3819bb36e3d8f1f 21-Mar-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 258528

This commit was generated by merge_to_master.py.

Change-Id: Id197cbdde2c2881915f096c0426c741416884783
ndroid/javatests/src/org/chromium/content/browser/test/util/OWNERS
rowser_test_base.cc
rowser_test_utils.cc
rowser_test_utils.h
ontent_test_suite_base.cc
ontent_test_suite_base.h
ayouttest_support.h
ock_render_thread.cc
ender_view_test.cc
ender_view_test.h
est_file_system_backend.cc
est_file_system_context.cc
est_file_system_context.h
est_launcher.cc
est_launcher.h
a1401311d1ab56c4ed0a474bd38c108f75cb0cd9 18-Mar-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 257591

This commit was generated by merge_to_master.py.

Change-Id: I0010df2ec3fbb5d4947cd026de2feb150ce7a6b5
ndroid/javatests/src/org/chromium/content/browser/test/util/CallbackHelper.java
ndroid/javatests/src/org/chromium/content/browser/test/util/CriteriaHelper.java
ndroid/javatests/src/org/chromium/content/browser/test/util/MockOrientationObserver.java
ndroid/javatests/src/org/chromium/content/browser/test/util/OrientationChangeObserverCriteria.java
sync_file_test_helper.cc
rowser_test_base.cc
rowser_test_base.h
rowser_test_utils.cc
rowser_test_utils.h
ake_speech_recognition_manager.cc
ake_speech_recognition_manager.h
ock_render_process_host.cc
ock_render_process_host.h
ock_render_thread.cc
ock_render_thread.h
ender_view_test.cc
ender_view_test.h
est_file_system_backend.cc
est_file_system_backend.h
est_launcher.cc
est_launcher.h
est_renderer_host.cc
est_renderer_host.h
est_utils.cc
est_utils.h
5d1f7b1de12d16ceb2c938c56701a3e8bfa558f7 21-Feb-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 251904

This commit was generated by merge_to_master.py.

Change-Id: I1f9543259d7d2a57d81aa41a1b84f85837439d21
EPS
ndroid/javatests/src/org/chromium/content/browser/test/util/CallbackHelper.java
ndroid/javatests/src/org/chromium/content/browser/test/util/CriteriaHelper.java
ndroid/javatests/src/org/chromium/content/browser/test/util/HistoryUtils.java
ndroid/javatests/src/org/chromium/content/browser/test/util/JavaScriptUtils.java
ndroid/javatests/src/org/chromium/content/browser/test/util/MockLocationProvider.java
ndroid/javatests/src/org/chromium/content/browser/test/util/UiUtils.java
sync_file_test_helper.cc
sync_file_test_helper.h
rowser_test_base.cc
rowser_test_base.h
rowser_test_utils.cc
rowser_test_utils.h
ownload_test_observer.cc
ownload_test_observer.h
ake_speech_recognition_manager.cc
ock_blob_url_request_context.cc
ock_blob_url_request_context.h
ock_download_item.h
ock_render_process_host.cc
ock_render_process_host.h
ock_render_thread.cc
ock_render_thread.h
ender_view_test.cc
ender_view_test.h
ender_widget_test.cc
ender_widget_test.h
andbox_file_system_test_helper.cc
andbox_file_system_test_helper.h
est_browser_context.cc
est_browser_context.h
est_file_system_backend.cc
est_file_system_backend.h
est_file_system_context.cc
est_file_system_context.h
est_file_system_options.cc
est_file_system_options.h
est_launcher.cc
est_launcher.h
est_renderer_host.cc
est_utils.cc
est_utils.h
a3f6a49ab37290eeeb8db0f41ec0f1cb74a68be7 18-Dec-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 240154

This commit was generated by merge_to_master.py.

Change-Id: I8f2ba858cf0e7f413dddedc2ae91dc37f7136c2e
ndroid/javatests/src/org/chromium/content/browser/test/NestedSystemMessageHandler.java
ndroid/javatests/src/org/chromium/content/browser/test/util/CallbackHelper.java
ndroid/javatests/src/org/chromium/content/browser/test/util/Criteria.java
ndroid/javatests/src/org/chromium/content/browser/test/util/CriteriaHelper.java
ndroid/javatests/src/org/chromium/content/browser/test/util/DOMUtils.java
ndroid/javatests/src/org/chromium/content/browser/test/util/HistoryUtils.java
ndroid/javatests/src/org/chromium/content/browser/test/util/JavaScriptUtils.java
ndroid/javatests/src/org/chromium/content/browser/test/util/KeyUtils.java
ndroid/javatests/src/org/chromium/content/browser/test/util/TestCallbackHelperContainer.java
ndroid/javatests/src/org/chromium/content/browser/test/util/TestContentViewClient.java
ndroid/javatests/src/org/chromium/content/browser/test/util/TestContentViewClientWrapper.java
ndroid/javatests/src/org/chromium/content/browser/test/util/TestInputMethodManagerWrapper.java
ndroid/javatests/src/org/chromium/content/browser/test/util/TestTouchUtils.java
ndroid/javatests/src/org/chromium/content/browser/test/util/TestWebContentsObserver.java
ndroid/javatests/src/org/chromium/content/browser/test/util/TouchCommon.java
ndroid/javatests/src/org/chromium/content/browser/test/util/UiUtils.java
rowser_test_base.cc
rowser_test_utils.cc
rowser_test_utils.h
ake_speech_recognition_manager.cc
ake_speech_recognition_manager.h
ock_render_process_host.cc
ock_render_process_host.h
ock_render_thread.cc
ock_render_thread.h
ender_view_test.cc
ender_view_test.h
ender_widget_test.h
est_launcher.cc
est_renderer_host.cc
est_renderer_host.h
est_utils.cc
f2477e01787aa58f445919b809d89e252beef54f 28-Nov-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 237746

This commit was generated by merge_to_master.py.

Change-Id: I8997af4cddfeb09a7c26f7e8e672c712cab461ea
WNERS
ndroid/javatests/src/org/chromium/content/browser/test/util/JavaScriptUtils.java
ndroid/javatests/src/org/chromium/content/browser/test/util/TestContentViewClientWrapper.java
ndroid/javatests/src/org/chromium/content/browser/test/util/TestTouchUtils.java
rowser_test_utils.cc
rowser_test_utils.h
ontent_test_suite_base.cc
ayouttest_support.h
ock_render_process_host.cc
ock_render_process_host.h
ock_render_thread.cc
ock_render_thread.h
ender_view_fake_resources_test.cc
ender_view_fake_resources_test.h
ender_view_test.cc
ender_view_test.h
ender_widget_test.cc
ender_widget_test.h
est_file_system_backend.cc
est_launcher.cc
est_navigation_observer.cc
est_navigation_observer.h
est_renderer_host.cc
est_renderer_host.h
nittest_test_suite.cc
0f1bc08d4cfcc34181b0b5cbf065c40f687bf740 06-Nov-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 232870

This commit was generated by merge_to_master.py.

Change-Id: I9cd2139013538e8bcd17966e8ff30ca5651d1a3d
ontent_test_suite_base.cc
est_launcher.cc
1e9bf3e0803691d0a228da41fc608347b6db4340 31-Oct-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 232015

This commit was generated by merge_to_master.py.

Change-Id: If86767ad396b9e2e1a4c1e9df1427daea29703ef
ndroid/OWNERS
rowser_test_base.cc
rowser_test_base.h
s_injection_ready_observer.h
ayouttest_support.h
ender_view_test.cc
est_browser_context.cc
est_browser_context.h
est_launcher.cc
est_launcher.h
est_renderer_host.cc
8bcbed890bc3ce4d7a057a8f32cab53fa534672e 22-Oct-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 230120

This commit was generated by merge_to_master.py.

Change-Id: I54bc06b7ee8a07092e74ce3b68c6893508349042
rowser_test_utils.cc
rowser_test_utils.h
ownload_test_observer.cc
ownload_test_observer.h
ock_download_manager.h
ock_render_thread.cc
ock_render_thread.h
est_launcher.cc
4e180b6a0b4720a9b8e9e959a882386f690f08ff 18-Oct-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 228962

This commit was generated by merge_to_master.py.

Change-Id: I23bd7d7766f213fd52f28ae5e1ecc6ae9df905ea
ndroid/javatests/src/org/chromium/content/browser/test/util/TestContentViewClientWrapper.java
rowser_test_base.cc
rowser_test_utils.cc
rowser_test_utils.h
ontent_test_suite_base.cc
ock_render_process_host.cc
ock_render_process_host.h
ock_render_thread.cc
ock_render_thread.h
andbox_file_system_test_helper.cc
andbox_file_system_test_helper.h
est_file_system_backend.cc
est_file_system_backend.h
est_file_system_context.cc
est_file_system_context.h
est_file_system_options.cc
est_file_system_options.h
est_launcher.cc
est_navigation_observer.cc
est_navigation_observer.h
est_utils.cc
est_utils.h
68043e1e95eeb07d5cae7aca370b26518b0867d6 26-Sep-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 225410

This commit was generated by merge_to_master.py.

Change-Id: Ifa1539ca216abb163295ee7a77f81bb67f52e178
ndroid/javatests/src/org/chromium/content/browser/test/util/TestInputMethodManagerWrapper.java
rowser_test_base.cc
rowser_test_base.h
rowser_test_utils.cc
est_launcher.cc
d0247b1b59f9c528cb6df88b4f2b9afaf80d181e 19-Sep-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 224184

This commit was generated by merge_to_master.py.

Change-Id: Ia3424df5abed9bea642c522b9e2358dceabd8423
rowser_test_utils.h
ender_view_test.cc
est_launcher.cc
est_launcher.h
58537e28ecd584eab876aee8be7156509866d23a 12-Sep-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 222756

This commit was generated by merge_to_master.py.

Change-Id: I40d7f32f195f328f005f230ea80d07092d48040e
rowser_test_base.cc
rowser_test_base.h
rowser_test_utils.cc
rowser_test_utils.h
ontent_test_suite_base.cc
ock_render_process_host.cc
ested_message_pump_android.cc
ender_view_fake_resources_test.cc
ender_view_test.cc
est_browser_thread.h
est_launcher.cc
424c4d7b64af9d0d8fd9624f381f469654d5e3d2 30-Aug-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r220549

This commit was generated by merge_to_master.py.

Change-Id: I8fcb82db764ec1eb0294280936c177bd9ba8a9e9
rowser_test_base.cc
ontent_test_suite_base.cc
est_file_error_injector.h
est_launcher.cc
3551c9c881056c480085172ff9840cab31610854 23-Aug-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r219274

This commit was generated by merge_to_master.py.

Change-Id: Ibb7f41396cadf4071e89153e1913c986d126f65d
rowser_test_base.cc
rowser_test_utils.cc
rowser_test_utils.h
ontent_test_suite_base.cc
ayouttest_support.h
ender_view_test.cc
est_browser_thread.h
est_browser_thread_bundle.cc
est_browser_thread_bundle.h
est_launcher.cc
c2db58bd994c04d98e4ee2cd7565b71548655fe3 14-Aug-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r217147

This commit was generated by merge_to_master.py.

Change-Id: Ifa927da4997e49ab95edfc5def5ee5615a76b1be
rowser_test_base.cc
rowser_test_base.h
ontent_test_suite_base.cc
ba5b9a6411cb1792fd21f0a078d7a25cd1ceec16 12-Aug-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r216972

This commit was generated by merge_to_master.py.

Change-Id: I01cb28d94e3fcf99e3624d75cafa50d929787ddd
ock_download_manager.cc
ock_download_manager.h
bb1529ce867d8845a77ec7cdf3e3003ef1771a40 08-Aug-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r216370

This commit was generated by merge_to_master.py.

Change-Id: I739228187a6f1df6c28c5761160e593a49891113
ender_view_fake_resources_test.cc
ender_view_test.cc
3240926e260ce088908e02ac07a6cf7b0c0cbf44 07-Aug-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r216133

This commit was generated by merge_to_master.py.

Change-Id: I541d5d1d8520b6b3829fbc1fa18552bf9ad4a5c7
ock_resource_context.cc
ock_resource_context.h
a36e5920737c6adbddd3e43b760e5de8431db6e0 05-Aug-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r215573

This commit was generated by merge_to_master.py.

Change-Id: Ib95814f98e5765b459dd32425f9bf9138edf2bca
ndroid/javatests/src/org/chromium/content/browser/test/util/TestContentViewClientWrapper.java
rowser_test_base.cc
d3868032626d59662ff73b372b5d584c1d144c53 31-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r214391

This commit was generated by merge_to_master.py.

Change-Id: Iad15fada300ebc6cf9cbcebfc484b1a5f5f372e5
ndroid/javatests/src/org/chromium/content/browser/test/util/TestContentViewClientWrapper.java
558790d6acca3451cf3a6b497803a5f07d0bec58 30-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r214332

This commit was generated by merge_to_master.py.

Change-Id: I82a7c38de906244dc882493568013be659aa65d1
ock_download_item.h
58e6fbe4ee35d65e14b626c557d37565bf8ad179 26-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r213780

This commit was generated by merge_to_master.py.

Change-Id: I9cf93efc460166e8ae27c76302af9095b402a90e
rowser_test_base.cc
rowser_test_utils.cc
rowser_test_utils.h
ock_render_thread.cc
ender_view_fake_resources_test.cc
est_launcher.cc
a3f7b4e666c476898878fa745f637129375cd889 24-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r213371

This commit was generated by merge_to_master.py.

Change-Id: I35a74205de4bff52a2dd6b15330f8a002a39efaf
ock_resource_context.cc
ock_resource_context.h
est_browser_context.cc
ca12bfac764ba476d6cd062bf1dde12cc64c3f40 23-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r213057

This commit was generated by merge_to_master.py.

Change-Id: I3e2e2506eb9b0080157e9c5f133559df3e600388
WNERS
ock_render_thread.h
ender_view_fake_resources_test.cc
est_browser_thread_bundle.cc
est_browser_thread_bundle.h
9ab5563a3196760eb381d102cbb2bc0f7abc6a50 18-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r212225

This commit was generated by merge_to_master.py.

Change-Id: I9b658b6bade7aff6166611a04fb26f4bcf0ca77c
ownload_test_observer.cc
ake_speech_recognition_manager.cc
ayouttest_support.h
ock_render_process_host.cc
ender_view_fake_resources_test.h
ender_view_test.h
est_browser_thread.cc
est_browser_thread_bundle.cc
est_navigation_observer.cc
est_renderer_host.h
est_utils.cc
7dbb3d5cf0c15f500944d211057644d6a2f37371 17-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r212014

This commit was generated by merge_to_master.py.

Change-Id: Ie0f261e9682cd8abea1eea1e51beab83d5eea21a
ndroid/javatests/src/org/chromium/content/browser/test/util/DOMUtils.java
rowser_test_utils.cc
rowser_test_utils.h
ownload_test_observer.cc
ownload_test_observer.h
ake_speech_recognition_manager.cc
ake_speech_recognition_manager.h
ayouttest_support.h
ock_download_item.h
ock_download_manager.cc
ock_download_manager.h
ock_render_process_host.cc
ender_view_fake_resources_test.cc
est_browser_context.cc
est_browser_context.h
est_browser_thread_bundle.cc
est_file_error_injector.cc
est_renderer_host.cc
est_renderer_host.h
eb525c5499e34cc9c4b825d6d9e75bb07cc06ace 10-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r210036

This commit was generated by merge_to_master.py.

Change-Id: Ib0e33a83ad5dfa541481e83d7acfc6970e68f471
ndroid/OWNERS
ndroid/javatests/src/org/chromium/content/browser/test/NestedSystemMessageHandler.java
rowser_test_base.h
rowser_test_utils.cc
ownload_test_observer.cc
ownload_test_observer.h
ock_download_item.h
ock_render_process_host.cc
ock_render_process_host.h
ested_message_pump_android.cc
ested_message_pump_android.h
ender_view_fake_resources_test.cc
est_launcher.cc
est_launcher.h
est_utils.cc
est_utils.h
7d4cd473f85ac64c3747c96c277f9e506a0d2246 19-Jun-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r207203

This commit was generated by merge_to_master.py.

Change-Id: I5fbb6854d092096c4d39edc2865a48be1b53c418
rowser_test_utils.cc
rowser_test_utils.h
ock_download_item.h
ock_render_process_host.cc
ock_render_process_host.h
ock_render_thread.cc
ock_render_thread.h
ender_view_fake_resources_test.cc
ender_view_test.cc
ender_view_test.h
ender_widget_test.cc
est_launcher.cc
est_launcher.h
est_renderer_host.cc
est_utils.cc
est_utils.h
nittest_test_suite.cc
868fa2fe829687343ffae624259930155e16dbd8 11-Jun-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r205460

This commit was generated by merge_to_master.py.

Change-Id: I4a744a5e426bd3bb378d887cfa56fe054742a540
rowser_test_utils.cc
ownload_test_observer.cc
ake_speech_recognition_manager.cc
ake_speech_recognition_manager.h
ayouttest_support.h
ock_download_item.h
ock_download_manager.h
ock_render_process_host.cc
ock_render_process_host.h
ock_render_thread.cc
ock_render_thread.h
ender_view_fake_resources_test.cc
ender_view_test.cc
ender_view_test.h
ender_widget_test.cc
est_browser_context.cc
est_browser_thread_bundle.cc
est_browser_thread_bundle.h
est_launcher.cc
est_launcher.h
est_navigation_observer.cc
est_navigation_observer.h
est_renderer_host.cc
est_renderer_host.h
est_utils.cc
est_utils.h
nittest_test_suite.cc
90dce4d38c5ff5333bea97d859d4e484e27edf0c 29-May-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r202854

This commit was generated by merge_to_master.py.

Change-Id: Idca323f71ef844a9e04f454d4f070b1e398f2deb
ndroid/javatests/src/org/chromium/content/browser/test/util/TestInputMethodManagerWrapper.java
rowser_test_base.cc
rowser_test_base.h
ownload_test_observer.cc
ownload_test_observer.h
ayouttest_support.h
ock_download_item.h
ock_download_manager.h
ock_render_process_host.cc
ender_view_fake_resources_test.cc
ender_view_test.cc
ender_widget_test.cc
ender_widget_test.h
est_file_error_injector.cc
est_file_error_injector.h
a93a17c8d99d686bd4a1511e5504e5e6cc9fcadf 15-May-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r200144

This commit was generated by merge_to_master.py.

Change-Id: I85f3a249ae157fd8253431215fb2dfcd12ee9bf3
ock_download_item.h
ock_render_process_host.cc
b2df76ea8fec9e32f6f3718986dba0d95315b29c 13-May-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r199464

This commit was generated by merge_to_master.py.

Change-Id: Ic3d1f97a4fb4edd1e6ed66a70b5040da1622b5a9
rowser_test_base.h
ayouttest_support.h
ock_render_process_host.cc
ock_render_process_host.h
ender_view_test.cc
nittest_test_suite.cc
eb_contents_tester.h
c2e0dbddbe15c98d52c4786dac06cb8952a8ae6d 09-May-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r198571

This commit was generated by merge_to_master.py.

Change-Id: I951118a03836157090561764dd2627f0add8118f
ndroid/javatests/src/org/chromium/content/browser/test/util/DOMUtils.java
ndroid/javatests/src/org/chromium/content/browser/test/util/TouchCommon.java
rowser_test_base.cc
rowser_test_base.h
ontent_test_suite_base.cc
ownload_test_observer.cc
ake_speech_recognition_manager.cc
ayouttest_support.h
ock_render_process_host.cc
ock_render_thread.cc
ock_render_thread.h
ender_view_fake_resources_test.cc
ender_view_fake_resources_test.h
ender_view_test.cc
ender_view_test.h
est_browser_context.cc
est_browser_thread.cc
est_browser_thread.h
est_content_client_initializer.cc
est_launcher.cc
est_renderer_host.cc
est_renderer_host.h
est_utils.cc
eb_contents_tester.h
2a99a7e74a7f215066514fe81d2bfa6639d9eddd 28-Mar-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r190564

This commit was generated by merge_to_master.py.

Change-Id: Icadecbce29854b8fa25fd335b2c1949b5ca5d170
WNERS
ccessibility_test_utils_win.cc
ccessibility_test_utils_win.h
ndroid/javatests/src/org/chromium/content/browser/test/util/CallbackHelper.java
ndroid/javatests/src/org/chromium/content/browser/test/util/DOMUtils.java
ndroid/javatests/src/org/chromium/content/browser/test/util/HistoryUtils.java
ndroid/javatests/src/org/chromium/content/browser/test/util/JavaScriptUtils.java
ndroid/javatests/src/org/chromium/content/browser/test/util/TestCallbackHelperContainer.java
ndroid/javatests/src/org/chromium/content/browser/test/util/TestContentViewClient.java
ndroid/javatests/src/org/chromium/content/browser/test/util/TestContentViewClientWrapper.java
ndroid/javatests/src/org/chromium/content/browser/test/util/TestTouchUtils.java
ndroid/javatests/src/org/chromium/content/browser/test/util/TouchCommon.java
ndroid/javatests/src/org/chromium/content/browser/test/util/TouchUtils.java
ndroid/javatests/src/org/chromium/content/browser/test/util/UiUtils.java
rowser_test.h
rowser_test_base.cc
rowser_test_base.h
rowser_test_utils.cc
rowser_test_utils.h
ontent_test_suite_base.cc
ownload_test_observer.cc
ownload_test_observer.h
ake_speech_recognition_manager.cc
ake_speech_recognition_manager.h
ayouttest_support.h
ock_download_item.h
ock_download_manager.cc
ock_download_manager.h
ock_render_process_host.cc
ock_render_process_host.h
ock_render_thread.cc
ock_render_thread.h
ock_resource_context.cc
ender_view_fake_resources_test.cc
ender_view_fake_resources_test.h
ender_view_test.cc
ender_view_test.h
ender_widget_test.cc
ender_widget_test.h
est_browser_context.cc
est_browser_context.h
est_browser_thread.cc
est_browser_thread.h
est_file_error_injector.cc
est_launcher.cc
est_launcher.h
est_navigation_observer.cc
est_navigation_observer.h
est_renderer_host.cc
est_utils.cc
est_utils.h
nittest_test_suite.cc
eb_contents_tester.cc
eb_contents_tester.h
5821806d5e7f356e8fa4b058a389a808ea183019 14-Nov-2012 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r167172

This commit was generated by merge_to_master.py.

Change-Id: Ib8d56fd5ae39a2d7e8c91dcd76cc6d13f25f2aab
EPS
WNERS
ccessibility_test_utils_win.cc
ccessibility_test_utils_win.h
ndroid/OWNERS
ndroid/javatests/src/org/chromium/content/browser/test/util/CallbackHelper.java
ndroid/javatests/src/org/chromium/content/browser/test/util/Criteria.java
ndroid/javatests/src/org/chromium/content/browser/test/util/CriteriaHelper.java
ndroid/javatests/src/org/chromium/content/browser/test/util/DOMUtils.java
ndroid/javatests/src/org/chromium/content/browser/test/util/HistoryUtils.java
ndroid/javatests/src/org/chromium/content/browser/test/util/JavaScriptUtils.java
ndroid/javatests/src/org/chromium/content/browser/test/util/KeyUtils.java
ndroid/javatests/src/org/chromium/content/browser/test/util/TestCallbackHelperContainer.java
ndroid/javatests/src/org/chromium/content/browser/test/util/TestContentViewClient.java
ndroid/javatests/src/org/chromium/content/browser/test/util/TestWebContentsObserver.java
ndroid/javatests/src/org/chromium/content/browser/test/util/TouchCommon.java
ndroid/javatests/src/org/chromium/content/browser/test/util/TouchUtils.java
ndroid/javatests/src/org/chromium/content/browser/test/util/UiUtils.java
rowser_test.h
rowser_test_base.cc
rowser_test_base.h
rowser_test_utils.cc
rowser_test_utils.h
ontent_test_suite_base.cc
ontent_test_suite_base.h
ownload_test_observer.cc
ownload_test_observer.h
s_injection_ready_observer.h
ock_download_item.cc
ock_download_item.h
ock_download_manager.cc
ock_download_manager.h
ock_notification_observer.cc
ock_notification_observer.h
ock_render_process_host.cc
ock_render_process_host.h
ock_render_thread.cc
ock_render_thread.h
ock_resource_context.cc
ock_resource_context.h
ender_view_fake_resources_test.cc
ender_view_fake_resources_test.h
ender_view_test.cc
ender_view_test.h
ender_widget_test.cc
ender_widget_test.h
est_browser_context.cc
est_browser_context.h
est_browser_thread.cc
est_browser_thread.h
est_content_client_initializer.cc
est_content_client_initializer.h
est_file_error_injector.cc
est_file_error_injector.h
est_launcher.cc
est_launcher.h
est_navigation_observer.cc
est_navigation_observer.h
est_notification_tracker.cc
est_notification_tracker.h
est_renderer_host.cc
est_renderer_host.h
est_utils.cc
est_utils.h
nittest_test_suite.cc
nittest_test_suite.h
eb_contents_tester.cc
eb_contents_tester.h