• Home
  • History
  • Annotate
  • only in /external/chromium_org/content/public/
History log of /external/chromium_org/content/public/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
c64ad5c2e063cde757eba7f9499a8e748b57cbdc 09-Dec-2014 Mikhail Naganov <mnaganov@google.com> Cherry-pick: [Android] Java Bridge: handle requests from Java Script on the background thread

Same as the upsteam patch, with purely syntactic adaptations of "override"
keywords usage to the legacy style used in M39.

Bug: 18520475

Original description:

commit a4b0d4cc0b9780aecd3e23a94293b2e3002baf7e
Author: mnaganov <mnaganov@chromium.org>
Date: Tue Dec 09 13:30:08 2014

[Android] Java Bridge: handle requests from Java Script on the background thread

This allows the page code that calls into injected objects methods to run even
if the browser UI thread is blocked (in WebView, the browser UI thread is the main
app thread, and sometimes people use synchronization primitives there that wait
on some action performed by the injected object, see the bug for an example).

In this CL, we make the minimal required amount of changes in order to simplify
cherry-picking into older branches. A cleanup CL (or CLs) will follow.

High-level description of changes:

1. We intercept messages from renderers on the IO thread using BrowserMessageFilter
and handle Java Bridge messages entirely on the background thread. This implies
the following changes:

2. GinJavaBridgeDispatcherHost has become RefCountedThreadSafe
(via BrowserMessageFilter)

3. We have to use route IDs of RenderFrameHosts instead of pointers to them, as
we can't access RFHs from IO or background threads.

4. Objects registry is now accessed from UI and background threads, and we have to use
locking. We can't anymore restrict access to the registry to a single thread.
This also means we can't anymore implement the registry using IDMap, as it is
explicitly non-thread-safe.

5. A lot of code was removed, as we now serve synchronous requests from renderers
without inter-thread hopping!

6. Of course, a new regression test has been added that now passes.

BUG=438255

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

Change-Id: I9e517024878f0b95a32f95524de4f8017ba8dc21
Cr-Commit-Position: refs/heads/master@{#307460}
ndroid/javatests/src/org/chromium/content/browser/JavaBridgeBasicsTest.java
83eff5096b2d7faaad5ebabc0a49f34aeb850acd 02-Dec-2014 Mikhail Naganov <mnaganov@google.com> Cherry-pick: [Android] Fix a subtle issue in Java Bridge regarding interfaces removal

Required for the main patch fixing b/18520475.

Bug: 18520475

Original description:

commit 4d4182c4af0a11a1ad5acae88f9abe2b76853fe1
Author: mnaganov <mnaganov@chromium.org>
Date: Mon Dec 01 11:59:14 2014

[Android] Fix a subtle issue in Java Bridge regarding interfaces removal

Update JavaBridgeBasicsTest.testRemovalNotReflectedUntilReload to actually
call Java GC after removing the interface, and verify that the Java object
is still callable from the page side. Fix the code to make the test pass.

BUG=437761

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

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

Change-Id: If12d53e3aad721e5822d8e12c85f1240e1aac5e6
ndroid/javatests/src/org/chromium/content/browser/JavaBridgeBasicsTest.java
930af317ad725fdc2a512aa7ddacfb8e33a74763 03-Dec-2014 Hui Shu <hush@google.com> Merge "Cherry pick: Attach ImeAdapter in CVC initialization." into m39
48eef54c197d31144759c7f837427ef2d3a63a36 03-Dec-2014 Hui Shu <hush@google.com> Cherry pick: Attach ImeAdapter in CVC initialization.

This is a clean cherry pick from:
https://crrev.com/06091eaf4543692caf7a0bcaf5c3a550dfca7078

We need to do this because in the Android WebView pop up flow, the
native WebContents object could possibly have received RenderViewReady
IPC message before the CVC is constructed and starts to observe the
WebContents.

BUG: 18527015
Change-Id: Ibccac065c0607bd2ec45c0a9e152128ea8805b7e
ndroid/java/src/org/chromium/content/browser/ContentViewCore.java
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
est/content_test_suite_base.cc
878de556fd9069b73122eb5d6155afc6b89112ce 25-Nov-2014 Hui Shu <hush@google.com> Merge "Cherry pick: Preserve IME state when clearing the selection" into m39
a62aef3d7fa98aafb37014ac82b34260f3f91d9b 25-Nov-2014 Hui Shu <hush@google.com> Cherry pick: Preserve IME state when clearing the selection

Cherry pick from Chromium:
https://crrev.com/d1d74981ce7baa010996c82a7b3423d06af466f1

Original Description:
When a paste or cut operation is performed in an editable region, and
the action bar is dismissed, the IME state should be preserved. Ensure
this by always using the editable region bit when clearing the selection
upon action bar dismissal.

BUG=435810

BUG: 18200283
Change-Id: Iefe239341010236ea6833c98ade34499970aae62
ndroid/java/src/org/chromium/content/browser/ContentViewCore.java
e4256316f8b5e8d1ec0df1f7762771622a53fa63 22-Nov-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 39.0.2171.90

This commit was generated by merge_to_master.py.

Change-Id: I1bb301dcfe74249d8b66fb60ba577e9095c86b8d
ommon/content_constants.cc
ommon/content_constants.h
d9512fb2dc45a909a2812842735be59e78b5171d 13-Nov-2014 Ben Murdoch <benm@google.com> Cherry pick [Android] Override text handle visibility when the view is
detached

Bug: 18373995

Original Description:

PopupWindows are used to render text handles in WebView. As these popups
are drawn outside of the web contents View hierarchy, it's possible that
their visibility becomes unsynchronized with the WebView itself. For
example, after the WebView has been detached from the window but
before it has been properly disposed of. Address this by overriding
handle visibility when the (content) View is detached, restoring it
only after re-attachment.

BUG=430859
(internal b/18066784)

Change-Id: I43b5ff63368384c3ff30ceece7ddd86aa0a4b738
Committed: https://crrev.com/0563c2785d0b1e62793ffb0f9dc3ac178559aeaa
Cr-Commit-Position: refs/heads/master@{#303987}
ndroid/java/src/org/chromium/content/browser/ContentViewCore.java
5154ef920639c9c98a8ae94355a7247c2fd82dc4 13-Nov-2014 Selim Gurun <sgurun@google.com> Clear the selection when hiding the handles

Bug: 18200283

Cherry-pick https://codereview.chromium.org/713493003.

Clear the selected text when hiding the handles and the desired
behavior is to "unselect all on dismiss".

BUG=430859
internal b/18200283

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

Change-Id: Ie8d751774c6341054f0c1b8d4cca91ba6877e373
Cr-Commit-Position: refs/heads/master@{#303946}
ndroid/java/src/org/chromium/content/browser/ContentViewCore.java
c016285e1e5f5f035c0063c966ef3d7f29ca550f 12-Nov-2014 Ben Murdoch <benm@google.com> Cherry pick [Android] Stop temporarily hiding selection handles

Bug: 18066784

Original change description:

Previously, selection handles would be hidden when the content view
became unfocused. This approach worked fine in Chrome, where the focus
model is predictable, but led to undesirable consequences in WebView,
e.g., the handles never being shown. For now, avoid making any kind of
visibility changes to the handles when the focus changes, ensuring
handle visibility is consistent with the selection.

Also ensure timely cleanup of the PopupTouchHandleDrawable Java object
after its native counterpart has been destroyed.

BUG=430859
(internal b/18066784)

Change-Id: I1741f81c5a12f71c053796cde37989366d2fcf10
Committed: https://crrev.com/1ba4ec56cb8f8e76f5d0cd37db09ebe41129c9c8
Cr-Commit-Position: refs/heads/master@{#303728}
ndroid/java/src/org/chromium/content/browser/input/PopupTouchHandleDrawable.java
f66cc3b6f091903a97b577e413da0c2acd80d3b7 12-Nov-2014 Ben Murdoch <benm@google.com> Cherry pick [Android] Support unfocusable container views.

Bug: 18066784

Original change description:

If the ContentViewCore container view is not focusable (which can
happen when it's emebedded in an app via android webview), we
were clearing the RWHVA notion of focus when the RenderView was
swapped out. As the view is never focusable again, chromium never
considers this view focused and as such, text selection did not
function.

We support this type of container view by always treating it focused
from Chromium's point of view.

BUG=430859
(internal b/18066784)

Change-Id: If08372c93ff0c87b483f0b408f04247764db2c56
Committed: https://crrev.com/9074d9fc9119ef4d2223f6c993d1a1b67a0bea7c
Cr-Commit-Position: refs/heads/master@{#303071}
ndroid/java/src/org/chromium/content/browser/ContentViewCore.java
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
est/render_view_test.cc
est/render_view_test.h
29b820f8d84e3bc97d62552e54923c42407f2f29 12-Nov-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 39.0.2171.59

This commit was generated by merge_to_master.py.

Change-Id: If9c0c09d8c3a3121b5e75ae9c4c446e4e4baaae6
ndroid/java/strings/translations/android_content_strings_am.xtb
ndroid/java/strings/translations/android_content_strings_ar.xtb
ndroid/java/strings/translations/android_content_strings_bg.xtb
ndroid/java/strings/translations/android_content_strings_ca.xtb
ndroid/java/strings/translations/android_content_strings_cs.xtb
ndroid/java/strings/translations/android_content_strings_da.xtb
ndroid/java/strings/translations/android_content_strings_de.xtb
ndroid/java/strings/translations/android_content_strings_el.xtb
ndroid/java/strings/translations/android_content_strings_en-GB.xtb
ndroid/java/strings/translations/android_content_strings_es-419.xtb
ndroid/java/strings/translations/android_content_strings_es.xtb
ndroid/java/strings/translations/android_content_strings_fa.xtb
ndroid/java/strings/translations/android_content_strings_fi.xtb
ndroid/java/strings/translations/android_content_strings_fil.xtb
ndroid/java/strings/translations/android_content_strings_fr.xtb
ndroid/java/strings/translations/android_content_strings_hi.xtb
ndroid/java/strings/translations/android_content_strings_hr.xtb
ndroid/java/strings/translations/android_content_strings_hu.xtb
ndroid/java/strings/translations/android_content_strings_id.xtb
ndroid/java/strings/translations/android_content_strings_it.xtb
ndroid/java/strings/translations/android_content_strings_iw.xtb
ndroid/java/strings/translations/android_content_strings_ja.xtb
ndroid/java/strings/translations/android_content_strings_ko.xtb
ndroid/java/strings/translations/android_content_strings_lt.xtb
ndroid/java/strings/translations/android_content_strings_lv.xtb
ndroid/java/strings/translations/android_content_strings_nl.xtb
ndroid/java/strings/translations/android_content_strings_no.xtb
ndroid/java/strings/translations/android_content_strings_pl.xtb
ndroid/java/strings/translations/android_content_strings_pt-BR.xtb
ndroid/java/strings/translations/android_content_strings_pt-PT.xtb
ndroid/java/strings/translations/android_content_strings_ro.xtb
ndroid/java/strings/translations/android_content_strings_ru.xtb
ndroid/java/strings/translations/android_content_strings_sk.xtb
ndroid/java/strings/translations/android_content_strings_sl.xtb
ndroid/java/strings/translations/android_content_strings_sr.xtb
ndroid/java/strings/translations/android_content_strings_sv.xtb
ndroid/java/strings/translations/android_content_strings_sw.xtb
ndroid/java/strings/translations/android_content_strings_th.xtb
ndroid/java/strings/translations/android_content_strings_tr.xtb
ndroid/java/strings/translations/android_content_strings_uk.xtb
ndroid/java/strings/translations/android_content_strings_vi.xtb
ndroid/java/strings/translations/android_content_strings_zh-CN.xtb
ndroid/java/strings/translations/android_content_strings_zh-TW.xtb
5b892326406927b709cdaf6c384d4ababf456332 06-Nov-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 39.0.2171.53

This commit was generated by merge_to_master.py.

Change-Id: Id583a0dc312e50e455eb8bd04f75c74304738c9d
ndroid/java/res/layout-land/date_time_picker_dialog.xml
ndroid/java/src/org/chromium/content/browser/ContentVideoView.java
ndroid/java/src/org/chromium/content/browser/accessibility/BrowserAccessibilityManager.java
ndroid/java/src/org/chromium/content/browser/accessibility/KitKatBrowserAccessibilityManager.java
ab8f6f0bd665d3c1ff476eb06c58c42630e462d4 29-Oct-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 39.0.2171.44

This commit was generated by merge_to_master.py.

Change-Id: I12ecf158017b8be5f9a1d33f4152e5a3c812cb7f
ndroid/java/src/org/chromium/content/app/ChildProcessService.java
5b62eb5758cb7b791cfdd45cf78f35dc060631b6 27-Oct-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 39.0.2171.38

This commit was generated by merge_to_master.py.

Change-Id: Id34e308a78a8e250aa0f0b60fcb9f882fc35382e
ndroid/java/res/drawable-xxxhdpi/pageinfo_warning_major.png
1675a649fd7a8b3cb80ffddae2dc181f122353c5 22-Oct-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 39.0.2171.37

This commit was generated by merge_to_master.py.

Change-Id: I4ca18a1d6d089e98b0511ad83f49e89d62401760
ndroid/java/res/drawable-hdpi/ic_menu_search_holo_light.png
ndroid/java/res/drawable-hdpi/ic_menu_share_holo_light.png
ndroid/java/res/drawable-mdpi/ic_menu_search_holo_light.png
ndroid/java/res/drawable-mdpi/ic_menu_share_holo_light.png
ndroid/java/res/drawable-xhdpi/ic_menu_search_holo_light.png
ndroid/java/res/drawable-xhdpi/ic_menu_share_holo_light.png
ndroid/java/res/drawable-xxhdpi/ic_menu_search_holo_light.png
ndroid/java/res/drawable-xxhdpi/ic_menu_share_holo_light.png
ndroid/java/res/drawable-xxxhdpi/ic_menu_search_holo_light.png
ndroid/java/res/drawable-xxxhdpi/ic_menu_share_holo_light.png
ndroid/java/src/org/chromium/content/browser/ContentViewCore.java
ndroid/java/src/org/chromium/content/browser/WebContentsObserverAndroid.java
ndroid/java/src/org/chromium/content/browser/input/PopupTouchHandleDrawable.java
b985a5157c04424e8c2fd5091938349a768d4329 05-Sep-2014 Marcin Kosiba <mkosiba@google.com> Use system resources for share and websearch action bar.

BUG: 18067099
Change-Id: Ia2fab595694aa62578f3f771a322c2938662ba94
(cherry picked from commit c1b5f4741325a2fe727a982238efe6730552466f)
(cherry picked from commit 7e059cd366764f33d7cc86e290609a74b115403e)
ndroid/java/res/menu/select_action_menu.xml
4ccfafb49a467adf7819cc5933ef036c1ee41c10 13-Oct-2014 mkosiba <mkosiba@chromium.org> Cherry-pick "[android_webview] Hardcode the default text encoding to UTF-8."

The WebView will use a fixed default value for the text encoding instead
of getting it from the platform. This is in attempt to unify behavior
between devices.

BUG=422366

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

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

Conflicts:
DEPS
android_webview/buildbot/aosp_manifest.xml
android_webview/renderer/aw_content_renderer_client.h
chrome/renderer/chrome_content_renderer_client.h

Change-Id: I0b4f507e6e439561bf89e3a0e668910cbf0c9e08
enderer/content_renderer_client.cc
enderer/content_renderer_client.h
34680572440d7894ef8dafce81d8039ed80726a2 14-Oct-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 39.0.2171.26

This commit was generated by merge_to_master.py.

Change-Id: I7e2a210cf0e24a4fbfd446a03aab3b29edbdd13a
ndroid/java/src/org/chromium/content/browser/accessibility/BrowserAccessibilityManager.java
ndroid/java/src/org/chromium/content/browser/input/GamepadList.java
ndroid/java/src/org/chromium/content/browser/input/HandleViewResources.java
ndroid/java/strings/translations/android_content_strings_am.xtb
ndroid/java/strings/translations/android_content_strings_ar.xtb
ndroid/java/strings/translations/android_content_strings_bg.xtb
ndroid/java/strings/translations/android_content_strings_ca.xtb
ndroid/java/strings/translations/android_content_strings_cs.xtb
ndroid/java/strings/translations/android_content_strings_da.xtb
ndroid/java/strings/translations/android_content_strings_de.xtb
ndroid/java/strings/translations/android_content_strings_el.xtb
ndroid/java/strings/translations/android_content_strings_en-GB.xtb
ndroid/java/strings/translations/android_content_strings_es-419.xtb
ndroid/java/strings/translations/android_content_strings_es.xtb
ndroid/java/strings/translations/android_content_strings_fa.xtb
ndroid/java/strings/translations/android_content_strings_fi.xtb
ndroid/java/strings/translations/android_content_strings_fil.xtb
ndroid/java/strings/translations/android_content_strings_fr.xtb
ndroid/java/strings/translations/android_content_strings_hi.xtb
ndroid/java/strings/translations/android_content_strings_hr.xtb
ndroid/java/strings/translations/android_content_strings_hu.xtb
ndroid/java/strings/translations/android_content_strings_id.xtb
ndroid/java/strings/translations/android_content_strings_it.xtb
ndroid/java/strings/translations/android_content_strings_iw.xtb
ndroid/java/strings/translations/android_content_strings_ja.xtb
ndroid/java/strings/translations/android_content_strings_ko.xtb
ndroid/java/strings/translations/android_content_strings_lt.xtb
ndroid/java/strings/translations/android_content_strings_lv.xtb
ndroid/java/strings/translations/android_content_strings_nl.xtb
ndroid/java/strings/translations/android_content_strings_no.xtb
ndroid/java/strings/translations/android_content_strings_pl.xtb
ndroid/java/strings/translations/android_content_strings_pt-BR.xtb
ndroid/java/strings/translations/android_content_strings_pt-PT.xtb
ndroid/java/strings/translations/android_content_strings_ro.xtb
ndroid/java/strings/translations/android_content_strings_ru.xtb
ndroid/java/strings/translations/android_content_strings_sk.xtb
ndroid/java/strings/translations/android_content_strings_sl.xtb
ndroid/java/strings/translations/android_content_strings_sr.xtb
ndroid/java/strings/translations/android_content_strings_sv.xtb
ndroid/java/strings/translations/android_content_strings_sw.xtb
ndroid/java/strings/translations/android_content_strings_th.xtb
ndroid/java/strings/translations/android_content_strings_tr.xtb
ndroid/java/strings/translations/android_content_strings_uk.xtb
ndroid/java/strings/translations/android_content_strings_vi.xtb
ndroid/java/strings/translations/android_content_strings_zh-CN.xtb
ndroid/java/strings/translations/android_content_strings_zh-TW.xtb
ommon/content_switches.cc
ommon/content_switches.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/java/res/drawable-hdpi/bubble.9.png
ndroid/java/res/drawable-hdpi/ic_menu_search_holo_light.png
ndroid/java/res/drawable-hdpi/ic_menu_share_holo_light.png
ndroid/java/res/drawable-hdpi/ondemand_overlay.9.png
ndroid/java/res/drawable-hdpi/pageinfo_warning_major.png
ndroid/java/res/drawable-mdpi/bubble.9.png
ndroid/java/res/drawable-mdpi/bubble_arrow_up.png
ndroid/java/res/drawable-mdpi/ic_menu_search_holo_light.png
ndroid/java/res/drawable-mdpi/ondemand_overlay.9.png
ndroid/java/res/drawable-mdpi/pageinfo_warning_major.png
ndroid/java/res/drawable-xhdpi/bubble.9.png
ndroid/java/res/drawable-xhdpi/ic_menu_search_holo_light.png
ndroid/java/res/drawable-xhdpi/ic_menu_share_holo_light.png
ndroid/java/res/drawable-xhdpi/ondemand_overlay.9.png
ndroid/java/res/drawable-xhdpi/pageinfo_warning_major.png
ndroid/java/res/drawable-xxhdpi/pageinfo_warning_major.png
ndroid/java/res/layout/date_time_picker_dialog.xml
ndroid/java/res/layout/multi_field_time_picker_dialog.xml
ndroid/java/res/layout/two_field_date_picker.xml
ndroid/java/resource_map/OWNERS
ndroid/java/resource_map/org/chromium/content/R.java
ndroid/java/src/org/chromium/content/app/ChildProcessService.java
ndroid/java/src/org/chromium/content/browser/BatteryStatusManager.java
ndroid/java/src/org/chromium/content/browser/BindingManagerImpl.java
ndroid/java/src/org/chromium/content/browser/BrowserStartupController.java
ndroid/java/src/org/chromium/content/browser/ChildProcessConnectionImpl.java
ndroid/java/src/org/chromium/content/browser/ChildProcessLauncher.java
ndroid/java/src/org/chromium/content/browser/ContentReadbackHandler.java
ndroid/java/src/org/chromium/content/browser/ContentVideoView.java
ndroid/java/src/org/chromium/content/browser/ContentVideoViewLegacy.java
ndroid/java/src/org/chromium/content/browser/ContentViewClient.java
ndroid/java/src/org/chromium/content/browser/ContentViewCore.java
ndroid/java/src/org/chromium/content/browser/ContentViewRenderView.java
ndroid/java/src/org/chromium/content/browser/DeviceSensors.java
ndroid/java/src/org/chromium/content/browser/LoadUrlParams.java
ndroid/java/src/org/chromium/content/browser/LocationProviderAdapter.java
ndroid/java/src/org/chromium/content/browser/LocationProviderFactory.java
ndroid/java/src/org/chromium/content/browser/MediaResourceGetter.java
ndroid/java/src/org/chromium/content/browser/NavigationClient.java
ndroid/java/src/org/chromium/content/browser/NavigationEntry.java
ndroid/java/src/org/chromium/content/browser/NavigationHistory.java
ndroid/java/src/org/chromium/content/browser/OWNERS
ndroid/java/src/org/chromium/content/browser/PageTransitionTypes.template
ndroid/java/src/org/chromium/content/browser/PopupZoomer.java
ndroid/java/src/org/chromium/content/browser/ResourceExtractor.java
ndroid/java/src/org/chromium/content/browser/ScreenOrientationListener.java
ndroid/java/src/org/chromium/content/browser/ScreenOrientationProvider.java
ndroid/java/src/org/chromium/content/browser/SmartClipProvider.java
ndroid/java/src/org/chromium/content/browser/WebContentsObserverAndroid.java
ndroid/java/src/org/chromium/content/browser/accessibility/AccessibilityInjector.java
ndroid/java/src/org/chromium/content/browser/accessibility/BrowserAccessibilityManager.java
ndroid/java/src/org/chromium/content/browser/accessibility/JellyBeanAccessibilityInjector.java
ndroid/java/src/org/chromium/content/browser/crypto/CipherFactory.java
ndroid/java/src/org/chromium/content/browser/framehost/NavigationControllerImpl.java
ndroid/java/src/org/chromium/content/browser/input/AdapterInputConnection.java
ndroid/java/src/org/chromium/content/browser/input/ChromeDatePickerDialog.java
ndroid/java/src/org/chromium/content/browser/input/DateDialogNormalizer.java
ndroid/java/src/org/chromium/content/browser/input/DateTimeChooserAndroid.java
ndroid/java/src/org/chromium/content/browser/input/DateTimePickerDialog.java
ndroid/java/src/org/chromium/content/browser/input/DateTimeSuggestion.java
ndroid/java/src/org/chromium/content/browser/input/DateTimeSuggestionListAdapter.java
ndroid/java/src/org/chromium/content/browser/input/ImeAdapter.java
ndroid/java/src/org/chromium/content/browser/input/InputDialogContainer.java
ndroid/java/src/org/chromium/content/browser/input/InputMethodManagerWrapper.java
ndroid/java/src/org/chromium/content/browser/input/MonthPicker.java
ndroid/java/src/org/chromium/content/browser/input/MonthPickerDialog.java
ndroid/java/src/org/chromium/content/browser/input/MultiFieldTimePickerDialog.java
ndroid/java/src/org/chromium/content/browser/input/PastePopupMenu.java
ndroid/java/src/org/chromium/content/browser/input/SelectPopupDialog.java
ndroid/java/src/org/chromium/content/browser/input/SelectPopupDropdown.java
ndroid/java/src/org/chromium/content/browser/input/TwoFieldDatePicker.java
ndroid/java/src/org/chromium/content/browser/input/TwoFieldDatePickerDialog.java
ndroid/java/src/org/chromium/content/browser/input/WeekPicker.java
ndroid/java/src/org/chromium/content/browser/input/WeekPickerDialog.java
ndroid/java/src/org/chromium/content/browser/webcontents/WebContentsImpl.java
ndroid/java/src/org/chromium/content/common/ContentSwitches.java
ndroid/java/src/org/chromium/content/common/ScreenOrientationValues.template
ndroid/java/src/org/chromium/content_public/Referrer.java
ndroid/java/src/org/chromium/content_public/browser/LoadUrlParams.java
ndroid/java/src/org/chromium/content_public/browser/NavigationController.java
ndroid/java/src/org/chromium/content_public/browser/NavigationEntry.java
ndroid/java/src/org/chromium/content_public/browser/NavigationHistory.java
ndroid/java/src/org/chromium/content_public/browser/WebContents.java
ndroid/java/src/org/chromium/content_public/common/Referrer.java
ndroid/java/src/org/chromium/content_public/common/ScreenOrientationConstants.java
ndroid/java/src/org/chromium/content_public/common/ScreenOrientationValues.template
ndroid/java/strings/android_content_strings.grd
ndroid/javatests/src/org/chromium/content/browser/ClipboardTest.java
ndroid/javatests/src/org/chromium/content/browser/ContentDetectionTestBase.java
ndroid/javatests/src/org/chromium/content/browser/ContentViewCoreSelectionTest.java
ndroid/javatests/src/org/chromium/content/browser/ContentViewLocationTest.java
ndroid/javatests/src/org/chromium/content/browser/ContentViewScrollingTest.java
ndroid/javatests/src/org/chromium/content/browser/ContentViewTestBase.java
ndroid/javatests/src/org/chromium/content/browser/DeviceSensorsTest.java
ndroid/javatests/src/org/chromium/content/browser/GestureDetectorResetTest.java
ndroid/javatests/src/org/chromium/content/browser/ImportantFileWriterAndroidTest.java
ndroid/javatests/src/org/chromium/content/browser/JavaBridgeBasicsTest.java
ndroid/javatests/src/org/chromium/content/browser/JavaBridgeTestBase.java
ndroid/javatests/src/org/chromium/content/browser/MediaResourceGetterTest.java
ndroid/javatests/src/org/chromium/content/browser/NavigationTest.java
ndroid/javatests/src/org/chromium/content/browser/ScreenOrientationProviderTest.java
ndroid/javatests/src/org/chromium/content/browser/TransitionTest.java
ndroid/javatests/src/org/chromium/content/browser/VSyncMonitorTest.java
ndroid/javatests/src/org/chromium/content/browser/WebContentsObserverAndroidTest.java
ndroid/javatests/src/org/chromium/content/browser/input/AdapterInputConnectionTest.java
ndroid/javatests/src/org/chromium/content/browser/input/ImeTest.java
ndroid/javatests/src/org/chromium/content/browser/input/InputDialogContainerTest.java
ndroid/javatests/src/org/chromium/content/browser/input/OWNERS
ndroid/javatests/src/org/chromium/content/browser/input/SelectPopupTest.java
ndroid/javatests/src/org/chromium/content/common/CleanupReferenceTest.java
pp/BUILD.gn
pp/content_main_delegate.cc
rowser/BUILD.gn
rowser/android/compositor.h
rowser/android/content_view_core.h
rowser/android/synchronous_compositor.h
rowser/android/ui_resource_provider.h
rowser/browser_message_filter.cc
rowser/browser_plugin_guest_delegate.h
rowser/browser_plugin_guest_manager.cc
rowser/browser_plugin_guest_manager.h
rowser/content_browser_client.cc
rowser/content_browser_client.h
rowser/desktop_media_id.cc
rowser/devtools_agent_host.h
rowser/devtools_http_handler.h
rowser/devtools_http_handler_delegate.h
rowser/devtools_manager_delegate.h
rowser/download_interrupt_reason_values.h
rowser/download_item.h
rowser/gpu_data_manager.h
rowser/host_zoom_map.h
rowser/load_notification_details.h
rowser/media_observer.h
rowser/navigation_controller.cc
rowser/navigation_controller.h
rowser/navigation_entry.h
rowser/page_navigator.cc
rowser/page_navigator.h
rowser/quota_permission_context.h
rowser/render_frame_host.h
rowser/render_widget_host.h
rowser/render_widget_host_view.h
rowser/resource_context.h
rowser/resource_request_info.h
rowser/screen_orientation_dispatcher_host.h
rowser/screen_orientation_provider.h
rowser/ssl_host_state_delegate.h
rowser/tracing_controller.h
rowser/utility_process_host.h
rowser/web_contents.h
rowser/web_contents_delegate.cc
rowser/web_contents_delegate.h
rowser/web_contents_observer.h
rowser/web_contents_view_delegate.cc
rowser/web_contents_view_delegate.h
rowser/web_ui.h
hild/BUILD.gn
ommon/BUILD.gn
ommon/OWNERS
ommon/common_param_traits_macros.h
ommon/content_switches.cc
ommon/content_switches.h
ommon/frame_navigate_params.cc
ommon/frame_navigate_params.h
ommon/manifest.cc
ommon/manifest.h
ommon/media_stream_request.h
ommon/page_transition_types.cc
ommon/page_transition_types.h
ommon/page_transition_types_list.h
ommon/pepper_plugin_info.h
ommon/renderer_preferences.cc
ommon/renderer_preferences.h
ommon/resource_devtools_info.h
ommon/resource_response.h
ommon/resource_response_info.h
ommon/sandbox_init.h
ommon/stop_find_action.h
ommon/storage_quota_params.h
ommon/three_d_api_types.h
ommon/url_constants.cc
ommon/url_constants.h
ommon/web_preferences.cc
ommon/web_preferences.h
lugin/BUILD.gn
enderer/BUILD.gn
enderer/browser_plugin_delegate.h
enderer/content_renderer_client.cc
enderer/content_renderer_client.h
enderer/navigation_state.cc
enderer/navigation_state.h
enderer/render_frame.h
enderer/render_frame_observer.h
enderer/render_view_observer.h
enderer/resource_fetcher.h
enderer/video_encode_accelerator.cc
est/android/BUILD.gn
est/android/javatests/src/org/chromium/content/browser/test/util/HistoryUtils.java
est/async_file_test_helper.cc
est/async_file_test_helper.h
est/browser_test_base.cc
est/browser_test_utils.cc
est/content_test_suite_base.cc
est/frame_load_waiter.cc
est/frame_load_waiter.h
est/layouttest_support.h
est/mock_blob_url_request_context.cc
est/mock_download_item.h
est/mock_render_process_host.cc
est/mock_render_process_host.h
est/mock_resource_context.cc
est/mock_resource_context.h
est/mock_special_storage_policy.h
est/mock_storage_client.cc
est/mock_storage_client.h
est/render_view_test.cc
est/render_widget_test.cc
est/sandbox_file_system_test_helper.cc
est/sandbox_file_system_test_helper.h
est/test_browser_context.cc
est/test_browser_thread_bundle.cc
est/test_file_system_backend.cc
est/test_file_system_backend.h
est/test_file_system_context.cc
est/test_file_system_context.h
est/test_file_system_options.h
est/test_launcher.cc
est/test_renderer_host.cc
est/test_renderer_host.h
est/web_contents_tester.h
tility/BUILD.gn
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/java/res/mipmap-hdpi/app_icon.png
ndroid/java/res/mipmap-mdpi/app_icon.png
ndroid/java/res/mipmap-xhdpi/app_icon.png
ndroid/java/res/mipmap-xxhdpi/app_icon.png
ndroid/java/res/mipmap-xxxhdpi/app_icon.png
ndroid/java/src/org/chromium/content/browser/ContentViewCore.java
ndroid/java/src/org/chromium/content/browser/LocationProviderFactory.java
ndroid/javatests/src/org/chromium/content/browser/PopupZoomerTest.java
ndroid/javatests/src/org/chromium/content/browser/input/ImeTest.java
rowser/browser_context.h
rowser/browser_plugin_guest_delegate.cc
rowser/browser_plugin_guest_delegate.h
rowser/browser_plugin_guest_manager.h
rowser/browser_thread.h
rowser/child_process_security_policy.h
rowser/content_browser_client.cc
rowser/content_browser_client.h
rowser/cookie_store_factory.h
rowser/devtools_agent_host.h
rowser/devtools_agent_host_client.h
rowser/devtools_client_host.h
rowser/devtools_manager.h
rowser/invalidate_type.h
rowser/render_widget_host.h
rowser/resource_dispatcher_host_delegate.cc
rowser/resource_dispatcher_host_delegate.h
rowser/storage_partition.h
rowser/utility_process_host.h
rowser/web_contents.h
ommon/common_param_traits_macros.h
ommon/content_switches.cc
ommon/content_switches.h
ommon/storage_quota_params.h
ommon/web_preferences.h
enderer/platform_event_observer.h
enderer/render_frame.h
enderer/renderer_gamepad_provider.h
est/android/javatests/src/org/chromium/content/browser/test/util/DOMUtils.java
est/async_file_test_helper.cc
est/async_file_test_helper.h
est/browser_test_utils.cc
est/browser_test_utils.h
est/layouttest_support.h
est/mock_blob_url_request_context.cc
est/mock_blob_url_request_context.h
est/mock_special_storage_policy.h
est/mock_storage_client.cc
est/mock_storage_client.h
est/render_view_test.cc
est/render_widget_test.cc
est/sandbox_file_system_test_helper.cc
est/sandbox_file_system_test_helper.h
est/test_browser_context.cc
est/test_browser_context.h
est/test_file_system_backend.cc
est/test_file_system_backend.h
est/test_file_system_context.cc
est/test_file_system_context.h
est/test_file_system_options.cc
est/test_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/java/res/mipmap-hdpi/app_icon.png
ndroid/java/res/mipmap-mdpi/app_icon.png
ndroid/java/res/mipmap-xhdpi/app_icon.png
ndroid/java/res/mipmap-xxhdpi/app_icon.png
ndroid/java/res/mipmap-xxxhdpi/app_icon.png
ndroid/java/src/org/chromium/content/app/ChildProcessService.java
ndroid/java/src/org/chromium/content/browser/BatteryStatusManager.java
ndroid/java/src/org/chromium/content/browser/ChildProcessLauncher.java
ndroid/java/src/org/chromium/content/browser/ContentViewClient.java
ndroid/java/src/org/chromium/content/browser/ContentViewCore.java
ndroid/java/src/org/chromium/content/browser/ContentViewRenderView.java
ndroid/java/src/org/chromium/content/browser/MediaResourceGetter.java
ndroid/java/src/org/chromium/content/browser/SPenSupport.java
ndroid/java/src/org/chromium/content/browser/ScreenOrientationListener.java
ndroid/java/src/org/chromium/content/browser/ScreenOrientationProvider.java
ndroid/java/src/org/chromium/content/browser/input/AdapterInputConnection.java
ndroid/java/src/org/chromium/content/browser/input/ImeAdapter.java
ndroid/java/src/org/chromium/content/browser/input/PastePopupMenu.java
ndroid/java/src/org/chromium/content/browser/webcontents/WebContentsImpl.java
ndroid/java/src/org/chromium/content_public/browser/JavaScriptCallback.java
ndroid/java/src/org/chromium/content_public/browser/NavigationTransitionDelegate.java
ndroid/java/src/org/chromium/content_public/browser/WebContents.java
ndroid/javatests/src/org/chromium/content/browser/BatteryStatusManagerTest.java
ndroid/javatests/src/org/chromium/content/browser/ClipboardTest.java
ndroid/javatests/src/org/chromium/content/browser/ContentViewCoreFocusTest.java
ndroid/javatests/src/org/chromium/content/browser/DeviceSensorsTest.java
ndroid/javatests/src/org/chromium/content/browser/JavaBridgeBasicsTest.java
ndroid/javatests/src/org/chromium/content/browser/JavaBridgeChildFrameTest.java
ndroid/javatests/src/org/chromium/content/browser/JavaBridgeCoercionTest.java
ndroid/javatests/src/org/chromium/content/browser/MediaResourceGetterTest.java
ndroid/javatests/src/org/chromium/content/browser/ScreenOrientationListenerTest.java
ndroid/javatests/src/org/chromium/content/browser/ScreenOrientationProviderTest.java
ndroid/javatests/src/org/chromium/content/browser/TransitionTest.java
ndroid/javatests/src/org/chromium/content/browser/input/ImeTest.java
ndroid/javatests/src/org/chromium/content/browser/input/InputDialogContainerTest.java
pp/android_library_loader_hooks.h
rowser/BUILD.gn
rowser/android/devtools_auth.h
rowser/content_browser_client.h
rowser/devtools_agent_host.h
rowser/devtools_client_host.h
rowser/devtools_manager.h
rowser/invalidate_type.h
rowser/media_device_id.cc
rowser/render_view_host.h
rowser/service_worker_context.h
rowser/service_worker_usage_info.cc
rowser/service_worker_usage_info.h
rowser/ssl_host_state_delegate.h
rowser/storage_partition.h
rowser/web_contents.h
rowser/web_contents_delegate.h
hild/request_peer.h
ommon/common_param_traits_macros.h
ommon/content_switches.cc
ommon/content_switches.h
ommon/media_stream_request.h
ommon/sandbox_type_mac.h
ommon/web_preferences.cc
ommon/web_preferences.h
est/android/javatests/src/org/chromium/content/browser/test/NestedSystemMessageHandler.java
est/android/javatests/src/org/chromium/content/browser/test/util/MockLocationProvider.java
est/android/javatests/src/org/chromium/content/browser/test/util/TestCallbackHelperContainer.java
est/browser_test_base.cc
est/browser_test_utils.cc
est/render_view_test.cc
est/test_launcher.cc
est/test_renderer_host.cc
est/test_renderer_host.h
est/web_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
WNERS
ndroid/java/res/drawable-hdpi/pageinfo_warning_major.png
ndroid/java/res/drawable-mdpi/pageinfo_warning_major.png
ndroid/java/res/drawable-xhdpi/pageinfo_warning_major.png
ndroid/java/res/drawable-xxhdpi/pageinfo_warning_major.png
ndroid/java/src/org/chromium/content/browser/BrowserStartupController.java
ndroid/java/src/org/chromium/content/browser/ChildProcessLauncher.java
ndroid/java/src/org/chromium/content/browser/ContentReadbackHandler.java
ndroid/java/src/org/chromium/content/browser/ContentVideoView.java
ndroid/java/src/org/chromium/content/browser/ContentViewCore.java
ndroid/java/src/org/chromium/content/browser/ContentViewRenderView.java
ndroid/java/src/org/chromium/content/browser/DownloadController.java
ndroid/java/src/org/chromium/content/browser/DownloadInfo.java
ndroid/java/src/org/chromium/content/browser/MediaResourceGetter.java
ndroid/java/src/org/chromium/content/browser/PositionObserver.java
ndroid/java/src/org/chromium/content/browser/ScreenOrientationListener.java
ndroid/java/src/org/chromium/content/browser/ScreenOrientationProvider.java
ndroid/java/src/org/chromium/content/browser/SelectActionModeCallback.java
ndroid/java/src/org/chromium/content/browser/TracingControllerAndroid.java
ndroid/java/src/org/chromium/content/browser/ViewPositionObserver.java
ndroid/java/src/org/chromium/content/browser/input/AdapterInputConnection.java
ndroid/java/src/org/chromium/content/browser/input/ChromeDatePickerDialog.java
ndroid/java/src/org/chromium/content/browser/input/CursorController.java
ndroid/java/src/org/chromium/content/browser/input/HandleView.java
ndroid/java/src/org/chromium/content/browser/input/HandleViewResources.java
ndroid/java/src/org/chromium/content/browser/input/ImeAdapter.java
ndroid/java/src/org/chromium/content/browser/input/InputDialogContainer.java
ndroid/java/src/org/chromium/content/browser/input/InsertionHandleController.java
ndroid/java/src/org/chromium/content/browser/input/PastePopupMenu.java
ndroid/java/src/org/chromium/content/browser/input/PopupTouchHandleDrawable.java
ndroid/java/src/org/chromium/content/browser/input/SelectionEventType.template
ndroid/java/src/org/chromium/content/browser/input/SelectionHandleController.java
ndroid/java/src/org/chromium/content/browser/webcontents/WebContentsImpl.java
ndroid/java/src/org/chromium/content/common/ContentSwitches.java
ndroid/java/src/org/chromium/content_public/browser/WebContents.java
ndroid/java/strings/translations/android_content_strings_ro.xtb
ndroid/javatests/src/org/chromium/content/browser/BrowserStartupControllerTest.java
ndroid/javatests/src/org/chromium/content/browser/ContentViewReadbackTest.java
ndroid/javatests/src/org/chromium/content/browser/MediaResourceGetterTest.java
ndroid/javatests/src/org/chromium/content/browser/PostMessageTest.java
ndroid/javatests/src/org/chromium/content/browser/ScreenOrientationIntegrationTest.java
ndroid/javatests/src/org/chromium/content/browser/ScreenOrientationListenerTest.java
ndroid/javatests/src/org/chromium/content/browser/ScreenOrientationProviderTest.java
ndroid/javatests/src/org/chromium/content/browser/TracingControllerAndroidTest.java
ndroid/javatests/src/org/chromium/content/browser/TransitionTest.java
ndroid/javatests/src/org/chromium/content/browser/WebContentsObserverAndroidTest.java
ndroid/javatests/src/org/chromium/content/browser/input/AdapterInputConnectionTest.java
ndroid/javatests/src/org/chromium/content/browser/input/ImeTest.java
ndroid/javatests/src/org/chromium/content/browser/input/InsertionHandleTest.java
ndroid/javatests/src/org/chromium/content/browser/input/SelectionHandleTest.java
pp/content_main_delegate.cc
pp/content_main_delegate.h
rowser/android/content_view_core.h
rowser/android/synchronous_compositor.h
rowser/browser_context.h
rowser/browser_plugin_guest_delegate.h
rowser/child_process_security_policy.h
rowser/content_browser_client.cc
rowser/content_browser_client.h
rowser/devtools_client_host.h
rowser/devtools_frontend_host.h
rowser/devtools_frontend_host_delegate.h
rowser/download_interrupt_reason_values.h
rowser/indexed_db_context.h
rowser/load_from_memory_cache_details.cc
rowser/load_from_memory_cache_details.h
rowser/navigation_entry.h
rowser/push_messaging_service.h
rowser/render_process_host.h
rowser/render_widget_host_view_frame_subscriber.h
rowser/resource_dispatcher_host_delegate.cc
rowser/resource_dispatcher_host_delegate.h
rowser/resource_request_details.cc
rowser/resource_request_details.h
rowser/resource_request_info.h
rowser/resource_throttle.h
rowser/site_instance.h
rowser/ssl_host_state_delegate.h
rowser/storage_partition.h
rowser/tracing_controller.h
rowser/worker_service.h
hild/resource_dispatcher_delegate.h
ommon/common_param_traits_macros.h
ommon/content_switches.cc
ommon/content_switches.h
ommon/context_menu_params.h
ommon/process_type.h
ommon/push_messaging_status.cc
ommon/push_messaging_status.h
ommon/referrer.h
ommon/renderer_preferences.cc
ommon/renderer_preferences.h
ommon/resource_response_info.cc
ommon/resource_response_info.h
ommon/resource_type.cc
ommon/resource_type.h
ommon/url_constants.cc
ommon/url_constants.h
ommon/web_preferences.cc
ommon/web_preferences.h
lugin/BUILD.gn
enderer/content_renderer_client.cc
enderer/media_stream_audio_sink.cc
enderer/render_font_warmup_win.cc
enderer/render_frame.h
enderer/render_view.h
enderer/render_view_observer.h
enderer/resource_fetcher.h
est/android/javatests/src/org/chromium/content/browser/test/NestedSystemMessageHandler.java
est/browser_test_base.cc
est/browser_test_utils.cc
est/mock_blob_url_request_context.cc
est/test_browser_context.cc
est/test_browser_context.h
est/test_utils.h
tility/BUILD.gn
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
EADME
ndroid/OWNERS
ndroid/java/src/org/chromium/content/app/ContentApplication.java
ndroid/java/src/org/chromium/content/app/SandboxedProcessService13.java
ndroid/java/src/org/chromium/content/app/SandboxedProcessService14.java
ndroid/java/src/org/chromium/content/app/SandboxedProcessService15.java
ndroid/java/src/org/chromium/content/app/SandboxedProcessService16.java
ndroid/java/src/org/chromium/content/app/SandboxedProcessService17.java
ndroid/java/src/org/chromium/content/app/SandboxedProcessService18.java
ndroid/java/src/org/chromium/content/app/SandboxedProcessService19.java
ndroid/java/src/org/chromium/content/browser/BatteryStatusManager.java
ndroid/java/src/org/chromium/content/browser/ChildProcessLauncher.java
ndroid/java/src/org/chromium/content/browser/ContentView.java
ndroid/java/src/org/chromium/content/browser/ContentViewCore.java
ndroid/java/src/org/chromium/content/browser/DeviceUtils.java
ndroid/java/src/org/chromium/content/browser/DownloadController.java
ndroid/java/src/org/chromium/content/browser/SmartClipProvider.java
ndroid/java/src/org/chromium/content/browser/TracingControllerAndroid.java
ndroid/java/src/org/chromium/content/browser/WebContentsObserverAndroid.java
ndroid/java/src/org/chromium/content/browser/accessibility/AccessibilityInjector.java
ndroid/java/src/org/chromium/content/browser/framehost/NavigationControllerImpl.java
ndroid/java/src/org/chromium/content/browser/input/AdapterInputConnection.java
ndroid/java/src/org/chromium/content/browser/input/ImeAdapter.java
ndroid/java/src/org/chromium/content/browser/webcontents/WebContentsImpl.java
ndroid/java/src/org/chromium/content_public/browser/NavigationController.java
ndroid/java/src/org/chromium/content_public/browser/WebContents.java
ndroid/java/strings/translations/android_content_strings_ar.xtb
ndroid/java/strings/translations/android_content_strings_da.xtb
ndroid/java/strings/translations/android_content_strings_es-419.xtb
ndroid/java/strings/translations/android_content_strings_fa.xtb
ndroid/java/strings/translations/android_content_strings_lt.xtb
ndroid/java/strings/translations/android_content_strings_lv.xtb
ndroid/java/strings/translations/android_content_strings_nl.xtb
ndroid/java/strings/translations/android_content_strings_no.xtb
ndroid/java/strings/translations/android_content_strings_pl.xtb
ndroid/java/strings/translations/android_content_strings_pt-PT.xtb
ndroid/java/strings/translations/android_content_strings_sk.xtb
ndroid/java/strings/translations/android_content_strings_vi.xtb
ndroid/javatests/src/org/chromium/content/browser/ClipboardTest.java
ndroid/javatests/src/org/chromium/content/browser/ContentViewCoreFocusTest.java
ndroid/javatests/src/org/chromium/content/browser/ContentViewCoreInputConnectionTest.java
ndroid/javatests/src/org/chromium/content/browser/ContentViewPopupZoomerTest.java
ndroid/javatests/src/org/chromium/content/browser/ContentViewReadbackTest.java
ndroid/javatests/src/org/chromium/content/browser/ContentViewScrollingTest.java
ndroid/javatests/src/org/chromium/content/browser/InterstitialPageTest.java
ndroid/javatests/src/org/chromium/content/browser/JavaBridgeArrayCoercionTest.java
ndroid/javatests/src/org/chromium/content/browser/JavaBridgeBasicsTest.java
ndroid/javatests/src/org/chromium/content/browser/JavaBridgeCoercionTest.java
ndroid/javatests/src/org/chromium/content/browser/TracingControllerAndroidTest.java
ndroid/javatests/src/org/chromium/content/browser/TransitionTest.java
ndroid/javatests/src/org/chromium/content/browser/VSyncMonitorTest.java
ndroid/javatests/src/org/chromium/content/browser/input/AdapterInputConnectionTest.java
ndroid/javatests/src/org/chromium/content/browser/input/ImeTest.java
ndroid/javatests/src/org/chromium/content/browser/input/InsertionHandleTest.java
ndroid/javatests/src/org/chromium/content/browser/input/SelectPopupTest.java
ndroid/javatests/src/org/chromium/content/browser/input/SelectionHandleTest.java
rowser/android/OWNERS
rowser/android/synchronous_compositor.h
rowser/appcache_service.h
rowser/ax_event_notification_details.cc
rowser/ax_event_notification_details.h
rowser/browser_plugin_guest_delegate.cc
rowser/browser_plugin_guest_delegate.h
rowser/browser_plugin_guest_manager.cc
rowser/browser_plugin_guest_manager.h
rowser/content_browser_client.cc
rowser/content_browser_client.h
rowser/devtools_manager_delegate.h
rowser/load_from_memory_cache_details.h
rowser/media_observer.h
rowser/navigation_entry.h
rowser/push_messaging_service.h
rowser/render_frame_host.h
rowser/render_process_host.h
rowser/render_view_host.h
rowser/render_widget_host.h
rowser/resource_context.h
rowser/resource_dispatcher_host_delegate.cc
rowser/resource_dispatcher_host_delegate.h
rowser/resource_request_details.h
rowser/resource_request_info.h
rowser/speech_recognition_session_context.cc
rowser/speech_recognition_session_context.h
rowser/storage_partition.h
rowser/web_contents.cc
rowser/web_contents.h
rowser/web_contents_delegate.h
rowser/web_contents_observer.h
hild/resource_dispatcher_delegate.h
ommon/BUILD.gn
ommon/appcache_info.h
ommon/common_param_traits.cc
ommon/common_param_traits.h
ommon/common_param_traits_macros.h
ommon/content_client.cc
ommon/content_client.h
ommon/content_switches.cc
ommon/content_switches.h
ommon/context_menu_params.h
ommon/main_function_params.h
ommon/media_stream_request.cc
ommon/media_stream_request.h
ommon/push_messaging_status.cc
ommon/push_messaging_status.h
ommon/resource_response_info.cc
ommon/resource_type.cc
ommon/resource_type.h
ommon/screen_orientation_values_list.h
ommon/service_registry.h
ommon/web_preferences.cc
ommon/web_preferences.h
enderer/content_renderer_client.cc
enderer/content_renderer_client.h
enderer/render_font_warmup_win.cc
enderer/render_frame.h
enderer/render_frame_observer.h
enderer/render_thread.h
enderer/render_view.h
enderer/render_view_observer.h
enderer/renderer_ppapi_host.h
enderer/web_preferences.h
est/android/OWNERS
est/android/javatests/src/org/chromium/content/browser/test/util/DOMUtils.java
est/android/javatests/src/org/chromium/content/browser/test/util/TestContentViewClientWrapper.java
est/browser_test_utils.cc
est/browser_test_utils.h
est/content_browser_test_utils.cc
est/content_browser_test_utils.h
est/content_test_suite_base.cc
est/layouttest_support.h
est/mock_render_process_host.cc
est/mock_render_process_host.h
est/mock_render_thread.cc
est/mock_render_thread.h
est/render_view_test.cc
est/test_renderer_host.cc
est/test_renderer_host.h
est/test_utils.cc
est/test_utils.h
est/web_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/java/res/drawable-mdpi/bubble.9.png
ndroid/java/res/drawable-mdpi/bubble_arrow_up.png
ndroid/java/res/drawable-mdpi/ic_menu_search_holo_light.png
ndroid/java/res/drawable-mdpi/ic_menu_share_holo_light.png
ndroid/java/res/drawable-mdpi/ondemand_overlay.9.png
ndroid/java/res/drawable-mdpi/pageinfo_warning_major.png
ndroid/java/res/drawable/bubble.9.png
ndroid/java/res/drawable/bubble_arrow_up.png
ndroid/java/res/drawable/ic_menu_search_holo_light.png
ndroid/java/res/drawable/ic_menu_share_holo_light.png
ndroid/java/res/drawable/ondemand_overlay.9.png
ndroid/java/res/drawable/pageinfo_warning_major.png
ndroid/java/src/org/chromium/content/browser/BatteryStatusManager.java
ndroid/java/src/org/chromium/content/browser/ContentView.java
ndroid/java/src/org/chromium/content/browser/ContentViewCore.java
ndroid/java/src/org/chromium/content/browser/WebContentsObserverAndroid.java
ndroid/java/src/org/chromium/content/browser/input/AdapterInputConnection.java
ndroid/java/src/org/chromium/content/browser/input/ImeAdapter.java
ndroid/javatests/src/org/chromium/content/browser/BatteryStatusManagerTest.java
rowser/BUILD.gn
rowser/android/content_view_core.h
rowser/browser_plugin_guest_delegate.h
rowser/content_browser_client.cc
rowser/content_browser_client.h
rowser/plugin_service.h
rowser/web_contents_observer.h
ommon/content_switches.cc
ommon/content_switches.h
ommon/sandbox_type_mac.h
enderer/BUILD.gn
enderer/renderer_gamepad_provider.h
est/android/javatests/src/org/chromium/content/browser/test/util/TestCallbackHelperContainer.java
est/android/javatests/src/org/chromium/content/browser/test/util/TestWebContentsObserver.java
est/browser_test_base.cc
est/content_browser_test.cc
est/layouttest_support.h
est/sandbox_file_system_test_helper.cc
est/test_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/OWNERS
ndroid/java/src/org/chromium/content/browser/ContentViewCore.java
ndroid/java/src/org/chromium/content/browser/WebContentsObserverAndroid.java
ndroid/java/src/org/chromium/content/browser/input/GamepadList.java
ndroid/java/src/org/chromium/content/browser/input/HandleView.java
ndroid/java/src/org/chromium/content/browser/input/ImeAdapter.java
ndroid/javatests/src/org/chromium/content/browser/JavaBridgeChildFrameTest.java
pp/BUILD.gn
rowser/BUILD.gn
rowser/android/compositor.h
rowser/android/compositor_client.h
rowser/android/synchronous_compositor.h
rowser/android/ui_resource_client_android.h
rowser/android/ui_resource_provider.h
rowser/browser_context.h
rowser/browser_message_filter.cc
rowser/browser_message_filter.h
rowser/browser_plugin_guest_delegate.h
rowser/browser_plugin_guest_manager.cc
rowser/browser_plugin_guest_manager.h
rowser/child_process_data.h
rowser/content_browser_client.cc
rowser/content_browser_client.h
rowser/download_manager.h
rowser/geolocation_permission_context.h
rowser/host_zoom_map.h
rowser/push_messaging_service.h
rowser/render_widget_host_view_mac_delegate.h
rowser/resource_dispatcher_host_delegate.cc
rowser/resource_dispatcher_host_delegate.h
ommon/OWNERS
ommon/assert_matching_enums.cc
ommon/common_param_traits_macros.h
ommon/content_descriptors.h
ommon/content_switches.cc
ommon/content_switches.h
ommon/resource_response_info.cc
ommon/resource_response_info.h
ommon/sandbox_type_mac.h
ommon/sandboxed_process_launcher_delegate.cc
ommon/sandboxed_process_launcher_delegate.h
ommon/url_constants.cc
ommon/url_constants.h
lugin/BUILD.gn
enderer/BUILD.gn
enderer/content_renderer_client.cc
enderer/content_renderer_client.h
enderer/render_view.h
enderer/render_view_observer.cc
enderer/render_view_observer.h
est/android/javatests/src/org/chromium/content/browser/test/util/DOMUtils.java
est/browser_test_base.cc
est/content_browser_test.cc
est/layouttest_support.h
est/mock_download_manager.cc
est/mock_download_manager.h
est/test_browser_context.cc
est/test_browser_context.h
est/test_launcher.cc
tility/BUILD.gn
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
ndroid/java/src/org/chromium/content/app/ChildProcessService.java
ndroid/java/src/org/chromium/content/browser/ActivityContentVideoViewClient.java
ndroid/java/src/org/chromium/content/browser/ChildProcessLauncher.java
ndroid/java/src/org/chromium/content/browser/ContentViewClient.java
ndroid/java/src/org/chromium/content/browser/ContentViewCore.java
ndroid/java/src/org/chromium/content/browser/WebContentsObserverAndroid.java
ndroid/java/src/org/chromium/content/browser/input/CanonicalAxisIndex.template
ndroid/java/src/org/chromium/content/browser/input/CanonicalButtonIndex.template
ndroid/java/src/org/chromium/content/browser/input/GamepadDevice.java
ndroid/java/src/org/chromium/content/browser/input/GamepadList.java
ndroid/java/src/org/chromium/content/browser/input/GamepadMappings.java
ndroid/java/src/org/chromium/content/common/IChildProcessCallback.aidl
ndroid/java/src/org/chromium/content/common/SurfaceWrapper.aidl
ndroid/java/src/org/chromium/content/common/SurfaceWrapper.java
ndroid/javatests/src/org/chromium/content/browser/MediaResourceGetterTest.java
rowser/BUILD.gn
rowser/browser_plugin_guest_delegate.cc
rowser/browser_plugin_guest_delegate.h
rowser/content_browser_client.h
rowser/devtools_http_handler.h
rowser/devtools_target.h
rowser/navigation_controller.h
rowser/render_process_host.h
rowser/render_widget_host_view_mac_delegate.h
rowser/session_storage_namespace.h
rowser/web_contents.h
rowser/web_contents_delegate.h
rowser/web_contents_observer.h
hild/BUILD.gn
ommon/content_switches.cc
ommon/content_switches.h
ommon/media_stream_request.cc
ommon/media_stream_request.h
ommon/resource_devtools_info.cc
ommon/resource_devtools_info.h
ommon/resource_response_info.h
ommon/url_constants.cc
ommon/url_constants.h
enderer/BUILD.gn
enderer/media_stream_video_sink.cc
enderer/media_stream_video_sink.h
enderer/render_frame.h
enderer/render_view_observer.h
est/browser_test_base.cc
est/browser_test_base.h
est/browser_test_utils.cc
est/layouttest_support.h
est/mock_render_process_host.cc
est/mock_render_process_host.h
est/test_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
ndroid/java/resource_map/OWNERS
ndroid/java/src/org/chromium/content/browser/BatteryStatusManager.java
ndroid/java/src/org/chromium/content/browser/ContentReadbackHandler.java
ndroid/java/src/org/chromium/content/browser/ContentView.java
ndroid/java/src/org/chromium/content/browser/ContentViewCore.java
ndroid/java/src/org/chromium/content/browser/ContentViewRenderView.java
ndroid/java/src/org/chromium/content/browser/JellyBeanContentView.java
ndroid/java/src/org/chromium/content/browser/LoadUrlParams.java
ndroid/java/src/org/chromium/content/browser/MediaResourceGetter.java
ndroid/java/src/org/chromium/content/browser/SelectActionModeCallback.java
ndroid/java/src/org/chromium/content/browser/TracingControllerAndroid.java
ndroid/java/src/org/chromium/content/browser/accessibility/BrowserAccessibilityManager.java
ndroid/java/src/org/chromium/content/browser/input/AdapterInputConnection.java
ndroid/java/src/org/chromium/content/browser/input/ChromeDatePickerDialog.java
ndroid/java/src/org/chromium/content/browser/input/CursorController.java
ndroid/java/src/org/chromium/content/browser/input/DateTimePickerDialog.java
ndroid/java/src/org/chromium/content/browser/input/HandleView.java
ndroid/java/src/org/chromium/content/browser/input/ImeAdapter.java
ndroid/java/src/org/chromium/content/browser/input/InputDialogContainer.java
ndroid/java/src/org/chromium/content/browser/input/InsertionHandleController.java
ndroid/java/src/org/chromium/content/browser/input/MultiFieldTimePickerDialog.java
ndroid/java/src/org/chromium/content/browser/input/SelectPopupDropdown.java
ndroid/java/src/org/chromium/content/browser/input/SelectionHandleController.java
ndroid/java/src/org/chromium/content/browser/input/TwoFieldDatePickerDialog.java
ndroid/java/src/org/chromium/content_public/browser/GestureStateListener.java
ndroid/java/strings/translations/android_content_strings_el.xtb
ndroid/javatests/src/org/chromium/content/browser/JavaBridgeBasicsTest.java
ndroid/javatests/src/org/chromium/content/browser/JavaBridgeCoercionTest.java
ndroid/javatests/src/org/chromium/content/browser/MediaResourceGetterTest.java
ndroid/javatests/src/org/chromium/content/browser/input/InsertionHandleTest.java
ndroid/javatests/src/org/chromium/content/browser/input/SelectionHandleTest.java
pp/content_main_delegate.cc
pp/content_main_delegate.h
rowser/BUILD.gn
rowser/android/OWNERS
rowser/android/compositor.h
rowser/android/compositor_client.h
rowser/android/synchronous_compositor.h
rowser/android/synchronous_compositor_client.h
rowser/blob_handle.h
rowser/browser_child_process_host.h
rowser/browser_context.h
rowser/browser_message_filter.cc
rowser/browser_message_filter.h
rowser/browser_plugin_guest_delegate.cc
rowser/browser_plugin_guest_delegate.h
rowser/browser_plugin_guest_manager.cc
rowser/browser_plugin_guest_manager.h
rowser/browser_plugin_guest_manager_delegate.cc
rowser/browser_plugin_guest_manager_delegate.h
rowser/child_process_data.h
rowser/content_browser_client.cc
rowser/content_browser_client.h
rowser/devtools_agent_host.h
rowser/devtools_external_agent_proxy.h
rowser/devtools_external_agent_proxy_delegate.h
rowser/devtools_manager_delegate.h
rowser/devtools_protocol_constants_generator.py
rowser/geolocation_permission_context.h
rowser/geolocation_provider.h
rowser/host_zoom_map.h
rowser/navigation_controller.h
rowser/render_process_host.h
rowser/render_view_host.h
rowser/render_widget_host_view.h
rowser/service_worker_context.h
rowser/site_instance.h
rowser/stream_handle.h
rowser/web_contents.cc
rowser/web_contents.h
rowser/web_contents_delegate.cc
rowser/web_contents_delegate.h
rowser/web_contents_observer.cc
rowser/web_contents_observer.h
rowser/web_ui.h
rowser/zygote_host_linux.h
hild/request_peer.h
ommon/BUILD.gn
ommon/browser_plugin_permission_type.h
ommon/common_param_traits_macros.h
ommon/content_switches.cc
ommon/content_switches.h
ommon/page_state.cc
ommon/resource_response.h
ommon/resource_response_info.cc
ommon/resource_response_info.h
ommon/url_constants.cc
ommon/url_constants.h
ommon/zygote_fork_delegate_linux.h
enderer/BUILD.gn
enderer/media_stream_video_sink.cc
enderer/media_stream_video_sink.h
enderer/pepper_plugin_instance.h
enderer/render_frame_observer.h
enderer/render_view_observer.h
enderer/renderer_ppapi_host.h
enderer/v8_value_converter.h
est/browser_test_utils.cc
est/browser_test_utils.h
est/content_browser_test.cc
est/content_browser_test_utils.cc
est/content_browser_test_utils.h
est/javascript_test_observer.cc
est/javascript_test_observer.h
est/layouttest_support.h
est/mock_download_item.cc
est/mock_download_item.h
est/mock_render_process_host.cc
est/mock_render_process_host.h
est/mock_render_thread.cc
est/render_view_test.cc
est/render_view_test.h
est/test_browser_context.cc
est/test_browser_context.h
est/test_renderer_host.cc
est/test_renderer_host.h
est/unittest_test_suite.cc
est/unittest_test_suite.h
0de6073388f4e2780db8536178b129cd8f6ab386 15-May-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 269467

This commit was generated by merge_to_master.py.

Change-Id: Id6c03d44b5ad8b098017a943eb9ec8d804dfed99
ndroid/java/src/org/chromium/content/browser/ContentReadbackHandler.java
ndroid/java/src/org/chromium/content/browser/ContentViewRenderView.java
rowser/context_factory.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/java/src/org/chromium/content/browser/ContentViewCore.java
ndroid/java/src/org/chromium/content/browser/ContentViewRenderView.java
ndroid/java/src/org/chromium/content/browser/LoadUrlParams.java
ndroid/java/src/org/chromium/content/browser/TracingControllerAndroid.java
ndroid/java/src/org/chromium/content/browser/WebContentsObserverAndroid.java
ndroid/java/src/org/chromium/content/browser/input/SelectPopup.java
ndroid/java/src/org/chromium/content/browser/input/SelectPopupDialog.java
ndroid/java/src/org/chromium/content/browser/input/SelectPopupDropdown.java
ndroid/java/src/org/chromium/content/browser/input/SelectPopupItem.java
ndroid/javatests/src/org/chromium/content/browser/ScreenOrientationIntegrationTest.java
rowser/browser_context.h
rowser/browser_plugin_guest_delegate.cc
rowser/browser_plugin_guest_delegate.h
rowser/browser_plugin_guest_manager_delegate.cc
rowser/browser_plugin_guest_manager_delegate.h
rowser/content_browser_client.cc
rowser/content_browser_client.h
rowser/devtools_target.h
rowser/location_provider.h
rowser/notification_types.h
rowser/render_view_host.h
rowser/render_widget_host_view.h
rowser/render_widget_host_view_frame_subscriber.h
rowser/speech_recognition_session_config.h
rowser/speech_recognition_session_context.cc
rowser/speech_recognition_session_context.h
rowser/vibration_provider.h
rowser/web_contents.h
rowser/web_contents_delegate.cc
rowser/web_contents_delegate.h
rowser/web_contents_observer.cc
rowser/web_contents_observer.h
rowser/web_contents_view.h
ommon/child_process_sandbox_support_linux.h
ommon/content_client.cc
ommon/content_client.h
ommon/content_switches.cc
ommon/content_switches.h
ommon/context_menu_params.cc
ommon/context_menu_params.h
ommon/media_stream_request.cc
ommon/media_stream_request.h
ommon/page_state.h
ommon/url_constants.cc
ommon/url_constants.h
ommon/zygote_fork_delegate_linux.h
enderer/render_view_observer.h
est/android/javatests/src/org/chromium/content/browser/test/util/DOMUtils.java
est/browser_test_base.cc
est/browser_test_utils.cc
est/browser_test_utils.h
est/layouttest_support.h
est/render_view_test.cc
est/render_widget_test.cc
est/test_browser_context.cc
est/test_browser_context.h
est/test_navigation_observer.cc
08c107de54178bb0990a09adec724924e8bc9486 08-May-2014 Primiano Tucci <primiano@google.com> Cherry pick: [Android] Ignore isSystemKey from the framework.

BUG: 14438911

Upstream bug description:
[Android] Ignore isSystemKey from the framework.

Force isSystemKey flag to false as the Android framework is changing
this behavior and this is breaking DPAD keys.

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

Change-Id: Ic0711886412640696ad9cfca04877046a6b588bb
ndroid/java/src/org/chromium/content/browser/input/ImeAdapter.java
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
ndroid/java/src/org/chromium/content/app/ChildProcessService.java
ndroid/java/src/org/chromium/content/browser/ActivityContentVideoViewClient.java
ndroid/java/src/org/chromium/content/browser/BatteryStatusManager.java
ndroid/java/src/org/chromium/content/browser/ChildProcessConnection.java
ndroid/java/src/org/chromium/content/browser/ChildProcessConnectionImpl.java
ndroid/java/src/org/chromium/content/browser/ChildProcessLauncher.java
ndroid/java/src/org/chromium/content/browser/ContentVideoView.java
ndroid/java/src/org/chromium/content/browser/ContentVideoViewClient.java
ndroid/java/src/org/chromium/content/browser/ContentView.java
ndroid/java/src/org/chromium/content/browser/ContentViewCore.java
ndroid/java/src/org/chromium/content/browser/ContentViewRenderView.java
ndroid/java/src/org/chromium/content/browser/LoadUrlParams.java
ndroid/java/src/org/chromium/content/browser/OWNERS
ndroid/java/src/org/chromium/content/browser/PageInfo.java
ndroid/java/src/org/chromium/content/browser/TimeZoneMonitor.java
ndroid/java/src/org/chromium/content/browser/VSyncManager.java
ndroid/java/src/org/chromium/content/browser/VSyncMonitor.java
ndroid/java/src/org/chromium/content/browser/input/ImeAdapter.java
ndroid/java/src/org/chromium/content/common/DeviceTelephonyInfo.java
ndroid/java/src/org/chromium/content/common/IChildProcessService.aidl
ndroid/java/src/org/chromium/content_public/browser/GestureStateListener.java
ndroid/javatests/src/org/chromium/content/browser/BatteryStatusManagerTest.java
ndroid/javatests/src/org/chromium/content/browser/ChildProcessLauncherTest.java
ndroid/javatests/src/org/chromium/content/browser/JavaBridgeCoercionTest.java
ndroid/javatests/src/org/chromium/content/browser/OWNERS
ndroid/javatests/src/org/chromium/content/browser/VSyncMonitorTest.java
ndroid/javatests/src/org/chromium/content/browser/ViewportTest.java
ndroid/javatests/src/org/chromium/content/browser/input/AdapterInputConnectionTest.java
rowser/android/layer_tree_build_helper.h
rowser/browser_main_runner.h
rowser/browser_message_filter.cc
rowser/browser_message_filter.h
rowser/browser_thread.h
rowser/media_device_id.cc
rowser/media_device_id.h
rowser/render_process_host.h
rowser/render_widget_host.h
rowser/render_widget_host_view.h
rowser/service_worker_context.h
ommon/child_process_host.h
ommon/common_param_traits_macros.h
ommon/content_switches.cc
ommon/content_switches.h
ommon/eme_codec.h
ommon/renderer_preferences.cc
ommon/renderer_preferences.h
enderer/history_item_serialization.cc
enderer/history_item_serialization.h
enderer/key_system_info.h
enderer/pepper_plugin_instance.h
enderer/render_frame_observer.cc
enderer/render_thread.h
enderer/render_view_observer.cc
enderer/v8_value_converter.h
est/content_test_suite_base.cc
est/layouttest_support.h
est/mock_render_process_host.cc
est/mock_render_process_host.h
est/mock_render_thread.cc
est/mock_render_thread.h
est/mock_special_storage_policy.cc
est/mock_special_storage_policy.h
est/render_view_test.cc
est/render_view_test.h
est/sandbox_file_system_test_helper.cc
est/test_file_system_context.cc
est/test_navigation_observer.cc
est/test_navigation_observer.h
est/test_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/OWNERS
ndroid/java/src/org/chromium/content/browser/BatteryStatusManager.java
ndroid/java/src/org/chromium/content/browser/ContentVideoView.java
ndroid/java/src/org/chromium/content/browser/ContentView.java
ndroid/java/src/org/chromium/content/browser/ContentViewCore.java
ndroid/java/src/org/chromium/content/browser/ContentViewRenderView.java
ndroid/java/src/org/chromium/content/browser/DeviceMotionAndOrientation.java
ndroid/java/src/org/chromium/content/browser/DeviceSensors.java
ndroid/java/src/org/chromium/content/browser/NavigationHistory.java
ndroid/java/src/org/chromium/content/browser/OWNERS
ndroid/java/src/org/chromium/content/browser/RenderCoordinates.java
ndroid/java/src/org/chromium/content/browser/ScreenOrientationProvider.java
ndroid/java/src/org/chromium/content/browser/TracingControllerAndroid.java
ndroid/java/src/org/chromium/content/browser/WebContentsObserverAndroid.java
ndroid/java/src/org/chromium/content/browser/accessibility/BrowserAccessibilityManager.java
ndroid/java/src/org/chromium/content/browser/input/AdapterInputConnection.java
ndroid/java/src/org/chromium/content/browser/input/OWNERS
ndroid/java/src/org/chromium/content/browser/webcontents/WebContentsImpl.java
ndroid/java/src/org/chromium/content/common/DeviceTelephonyInfo.java
ndroid/java/src/org/chromium/content_public/browser/WebContents.java
ndroid/java/strings/translations/android_content_strings_th.xtb
ndroid/javatests/src/org/chromium/content/browser/BatteryStatusManagerTest.java
ndroid/javatests/src/org/chromium/content/browser/ContentDetectionTestBase.java
ndroid/javatests/src/org/chromium/content/browser/ContentViewCoreInputConnectionTest.java
ndroid/javatests/src/org/chromium/content/browser/ContentViewLocationTest.java
ndroid/javatests/src/org/chromium/content/browser/ContentViewPopupZoomerTest.java
ndroid/javatests/src/org/chromium/content/browser/ContentViewScrollingTest.java
ndroid/javatests/src/org/chromium/content/browser/ContentViewTestBase.java
ndroid/javatests/src/org/chromium/content/browser/DeviceMotionAndOrientationTest.java
ndroid/javatests/src/org/chromium/content/browser/DeviceSensorsTest.java
ndroid/javatests/src/org/chromium/content/browser/GestureDetectorResetTest.java
ndroid/javatests/src/org/chromium/content/browser/InterstitialPageTest.java
ndroid/javatests/src/org/chromium/content/browser/JavaBridgeBasicsTest.java
ndroid/javatests/src/org/chromium/content/browser/JavaBridgeChildFrameTest.java
ndroid/javatests/src/org/chromium/content/browser/JavaBridgeTestBase.java
ndroid/javatests/src/org/chromium/content/browser/NavigationTest.java
ndroid/javatests/src/org/chromium/content/browser/OWNERS
ndroid/javatests/src/org/chromium/content/browser/ScreenOrientationIntegrationTest.java
ndroid/javatests/src/org/chromium/content/browser/ScreenOrientationProviderTest.java
ndroid/javatests/src/org/chromium/content/browser/TestsJavaScriptEvalTest.java
ndroid/javatests/src/org/chromium/content/browser/input/AdapterInputConnectionTest.java
ndroid/javatests/src/org/chromium/content/browser/input/ImeTest.java
ndroid/javatests/src/org/chromium/content/browser/input/InsertionHandleTest.java
ndroid/javatests/src/org/chromium/content/browser/input/SelectPopupTest.java
ndroid/javatests/src/org/chromium/content/browser/input/SelectionHandleTest.java
rowser/ax_event_notification_details.h
rowser/browser_plugin_guest_delegate.cc
rowser/browser_plugin_guest_delegate.h
rowser/content_browser_client.h
rowser/desktop_notification_delegate.h
rowser/navigation_entry.h
rowser/render_process_host.h
rowser/render_view_host.h
rowser/render_widget_host.h
rowser/render_widget_host_view_mac_delegate.h
rowser/utility_process_host.h
rowser/web_contents_delegate.cc
rowser/web_contents_delegate.h
ommon/assert_matching_enums.cc
ommon/browser_plugin_permission_type.h
ommon/common_param_traits_macros.h
ommon/content_switches.cc
ommon/content_switches.h
ommon/drop_data.h
ommon/favicon_url.h
ommon/page_transition_types.cc
ommon/page_transition_types.h
ommon/screen_orientation_values_list.h
ommon/show_desktop_notification_params.cc
ommon/show_desktop_notification_params.h
ommon/zygote_fork_delegate_linux.h
enderer/content_renderer_client.h
enderer/key_system_info.h
enderer/render_frame.h
enderer/render_view.h
enderer/render_view_observer.h
enderer/v8_value_converter.h
est/android/javatests/src/org/chromium/content/browser/test/util/DOMUtils.java
est/android/javatests/src/org/chromium/content/browser/test/util/HistoryUtils.java
est/android/javatests/src/org/chromium/content/browser/test/util/TestCallbackHelperContainer.java
est/browser_test_base.cc
est/content_browser_test_utils.cc
est/content_browser_test_utils.h
est/content_test_suite_base.cc
est/layouttest_support.h
est/mock_storage_client.cc
est/mock_storage_client.h
est/render_view_test.cc
est/render_widget_test.cc
est/test_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/java/src/org/chromium/content/browser/ChildProcessLauncher.java
ndroid/java/src/org/chromium/content/browser/ContentVideoView.java
ndroid/java/src/org/chromium/content/browser/ContentView.java
ndroid/java/src/org/chromium/content/browser/ContentViewCore.java
ndroid/java/src/org/chromium/content/browser/DeviceUtils.java
ndroid/java/src/org/chromium/content/browser/TracingControllerAndroid.java
ndroid/java/src/org/chromium/content/common/ContentSwitches.java
ndroid/javatests/src/org/chromium/content/browser/JavaBridgeArrayCoercionTest.java
ndroid/javatests/src/org/chromium/content/browser/JavaBridgeArrayTest.java
ndroid/javatests/src/org/chromium/content/browser/JavaBridgeCoercionTest.java
pp/content_main_runner.h
rowser/android/external_video_surface_container.h
rowser/browser_plugin_guest_delegate.cc
rowser/browser_plugin_guest_delegate.h
rowser/content_browser_client.cc
rowser/content_browser_client.h
rowser/geolocation_permission_context.h
rowser/native_web_keyboard_event.h
rowser/render_widget_host.h
rowser/render_widget_host_view.h
rowser/resource_request_details.cc
rowser/resource_request_details.h
rowser/web_contents_view_delegate.h
rowser/web_drag_dest_delegate.h
ommon/browser_plugin_permission_type.h
ommon/common_param_traits.h
ommon/common_param_traits_macros.h
ommon/content_switches.cc
ommon/content_switches.h
ommon/webplugininfo.h
enderer/content_renderer_client.cc
enderer/content_renderer_client.h
enderer/render_font_warmup_win.cc
enderer/render_font_warmup_win.h
est/android/javatests/src/org/chromium/content/browser/test/util/CriteriaHelper.java
est/android/javatests/src/org/chromium/content/browser/test/util/TestCallbackHelperContainer.java
est/mock_render_process_host.cc
est/render_view_test.cc
est/render_view_test.h
est/test_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/java/src/org/chromium/content/app/ChildProcessService.java
ndroid/java/src/org/chromium/content/browser/BrowserStartupController.java
ndroid/java/src/org/chromium/content/browser/ChildProcessLauncher.java
ndroid/java/src/org/chromium/content/browser/ContentView.java
ndroid/java/src/org/chromium/content/browser/ContentViewCore.java
ndroid/java/src/org/chromium/content/browser/ContentViewRenderView.java
ndroid/java/src/org/chromium/content/browser/JellyBeanContentView.java
ndroid/java/src/org/chromium/content/browser/MediaResourceGetter.java
ndroid/java/src/org/chromium/content/browser/RenderCoordinates.java
ndroid/java/src/org/chromium/content/browser/crypto/ByteArrayGenerator.java
ndroid/java/src/org/chromium/content/browser/crypto/CipherFactory.java
ndroid/java/src/org/chromium/content/browser/crypto/OWNERS
ndroid/java/src/org/chromium/content/browser/input/AdapterInputConnection.java
ndroid/javatests/src/org/chromium/content/browser/ContentCommandLineTest.java
ndroid/javatests/src/org/chromium/content/browser/ContentDetectionTestBase.java
ndroid/javatests/src/org/chromium/content/browser/ContentViewLocationTest.java
ndroid/javatests/src/org/chromium/content/browser/ContentViewPopupZoomerTest.java
ndroid/javatests/src/org/chromium/content/browser/GestureDetectorResetTest.java
ndroid/javatests/src/org/chromium/content/browser/ImportantFileWriterAndroidTest.java
ndroid/javatests/src/org/chromium/content/browser/JavaBridgeBasicsTest.java
ndroid/javatests/src/org/chromium/content/browser/MediaResourceGetterTest.java
ndroid/javatests/src/org/chromium/content/browser/NavigationTest.java
ndroid/javatests/src/org/chromium/content/browser/ScreenOrientationIntegrationTest.java
ndroid/javatests/src/org/chromium/content/browser/TestsJavaScriptEvalTest.java
ndroid/javatests/src/org/chromium/content/browser/ViewportTest.java
ndroid/javatests/src/org/chromium/content/browser/crypto/CipherFactoryTest.java
ndroid/javatests/src/org/chromium/content/browser/crypto/OWNERS
ndroid/javatests/src/org/chromium/content/browser/input/ImeTest.java
ndroid/javatests/src/org/chromium/content/browser/input/InsertionHandleTest.java
ndroid/javatests/src/org/chromium/content/browser/input/SelectPopupTest.java
ndroid/javatests/src/org/chromium/content/browser/input/SelectionHandleTest.java
rowser/ax_event_notification_details.cc
rowser/ax_event_notification_details.h
rowser/download_save_info.h
rowser/download_url_parameters.h
rowser/quota_permission_context.h
rowser/render_frame_host.h
rowser/render_view_host.h
rowser/render_widget_host.h
rowser/render_widget_host_view_mac_delegate.h
rowser/resource_dispatcher_host_delegate.cc
rowser/resource_dispatcher_host_delegate.h
rowser/web_contents.h
rowser/web_ui_data_source.h
hild/request_peer.h
hild/resource_dispatcher_delegate.h
ommon/assert_matching_enums.cc
ommon/common_param_traits_macros.h
ommon/content_switches.cc
ommon/content_switches.h
ommon/storage_quota_params.h
enderer/render_frame.h
enderer/render_frame_observer.h
enderer/render_view.h
enderer/render_view_observer.h
est/android/javatests/src/org/chromium/content/browser/test/util/DOMUtils.java
est/android/javatests/src/org/chromium/content/browser/test/util/JavaScriptUtils.java
est/android/javatests/src/org/chromium/content/browser/test/util/TestCallbackHelperContainer.java
est/android/javatests/src/org/chromium/content/browser/test/util/TestContentViewClient.java
est/android/javatests/src/org/chromium/content/browser/test/util/TestContentViewClientWrapper.java
est/browser_test_utils.cc
est/content_browser_test_utils.cc
est/mock_render_thread.cc
est/mock_render_thread.h
est/render_view_test.cc
est/render_view_test.h
e5d81f57cb97b3b6b7fccc9c5610d21eb81db09d 03-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 261286

This commit was generated by merge_to_master.py.

Change-Id: Iea9643ce91618057f128e9a5b62c07be152f2b89
ndroid/java/src/org/chromium/content/browser/ContentViewCore.java
ndroid/java/src/org/chromium/content/browser/ScreenOrientationListener.java
ndroid/java/src/org/chromium/content/common/ContentSwitches.java
rowser/native_web_keyboard_event.h
rowser/render_view_host.h
rowser/render_widget_host_view_mac_delegate.h
rowser/web_contents.h
ommon/zygote_fork_delegate_linux.h
enderer/video_encode_accelerator.cc
enderer/video_encode_accelerator.h
4ad1aa43a48567659193a298fad74f55e00b3dd9 01-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 260540

This commit was generated by merge_to_master.py.

Change-Id: I10b8e4931992bb84eb4da800a337bbd0a52f6588
ndroid/java/src/org/chromium/content/app/ChildProcessService.java
ndroid/java/src/org/chromium/content/browser/ChildProcessLauncher.java
ndroid/java/src/org/chromium/content/common/IChildProcessCallback.aidl
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
WNERS
ndroid/OWNERS
ndroid/java/src/org/chromium/content/app/ChildProcessService.java
ndroid/java/src/org/chromium/content/browser/BrowserStartupController.java
ndroid/java/src/org/chromium/content/browser/ContentViewClient.java
ndroid/java/src/org/chromium/content/browser/ContentViewCore.java
ndroid/java/src/org/chromium/content/browser/VSyncMonitor.java
ndroid/java/src/org/chromium/content/browser/accessibility/BrowserAccessibilityManager.java
ndroid/java/src/org/chromium/content/browser/input/CursorController.java
ndroid/java/src/org/chromium/content/browser/input/HandleView.java
ndroid/java/src/org/chromium/content/browser/input/InsertionHandleController.java
ndroid/java/src/org/chromium/content/browser/input/SelectPopupAdapter.java
ndroid/java/src/org/chromium/content/browser/input/SelectionHandleController.java
ndroid/java/strings/translations/android_content_strings_ca.xtb
ndroid/java/strings/translations/android_content_strings_el.xtb
ndroid/javatests/src/org/chromium/content/browser/ContentCommandLineTest.java
ndroid/javatests/src/org/chromium/content/browser/ContentViewCoreDpadTest.java
ndroid/javatests/src/org/chromium/content/browser/ContentViewScrollingTest.java
ndroid/javatests/src/org/chromium/content/browser/ImportantFileWriterAndroidTest.java
ndroid/javatests/src/org/chromium/content/browser/JavaBridgeBasicsTest.java
ndroid/javatests/src/org/chromium/content/browser/ScreenOrientationListenerTest.java
ndroid/javatests/src/org/chromium/content/browser/ScreenOrientationProviderTest.java
ndroid/javatests/src/org/chromium/content/browser/input/InsertionHandleTest.java
ndroid/javatests/src/org/chromium/content/browser/input/SelectionHandleTest.java
rowser/android/content_view_core.h
rowser/browser_context.h
rowser/child_process_security_policy.h
rowser/devtools_agent_host.h
rowser/download_item.h
rowser/render_frame_host.h
rowser/render_view_host.h
rowser/render_widget_host.h
rowser/service_worker_context.h
rowser/storage_partition.h
rowser/stream_handle.h
rowser/web_contents_delegate.h
rowser/web_ui.h
rowser/web_ui_data_source.h
ommon/common_param_traits_macros.h
ommon/content_switches.cc
ommon/content_switches.h
ommon/context_menu_params.cc
ommon/context_menu_params.h
ommon/drop_data.cc
ommon/drop_data.h
ommon/media_stream_request.cc
ommon/media_stream_request.h
enderer/render_frame.h
enderer/render_frame_observer.h
enderer/render_thread.h
enderer/render_view.h
est/browser_test_utils.cc
est/browser_test_utils.h
est/content_browser_test.cc
est/content_browser_test.h
est/content_browser_test_utils.cc
est/content_browser_test_utils.h
est/content_browser_test_utils_mac.mm
est/layouttest_support.h
est/mock_download_item.h
est/test_browser_context.cc
est/test_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/java/src/org/chromium/content/browser/ContentViewCore.java
ndroid/java/src/org/chromium/content/browser/ContentViewRenderView.java
ndroid/java/src/org/chromium/content/browser/OWNERS
ndroid/java/src/org/chromium/content/browser/ResourceExtractor.java
ndroid/java/src/org/chromium/content/browser/accessibility/BrowserAccessibilityManager.java
ndroid/java/src/org/chromium/content/browser/input/AdapterInputConnection.java
ndroid/java/src/org/chromium/content/browser/input/ImeAdapter.java
ndroid/java/src/org/chromium/content/browser/third_party/GestureDetector.java
ndroid/javatests/src/org/chromium/content/browser/ContentViewCoreInputConnectionTest.java
ndroid/javatests/src/org/chromium/content/browser/JavaBridgeBasicsTest.java
ndroid/javatests/src/org/chromium/content/browser/OWNERS
ndroid/javatests/src/org/chromium/content/browser/ScreenOrientationListenerTest.java
ndroid/javatests/src/org/chromium/content/browser/ScreenOrientationProviderTest.java
ndroid/javatests/src/org/chromium/content/browser/input/AdapterInputConnectionTest.java
ndroid/javatests/src/org/chromium/content/browser/input/ImeTest.java
pp/content_main.h
rowser/content_browser_client.h
rowser/devtools_agent_host.h
rowser/host_zoom_map.h
rowser/render_frame_host.h
rowser/render_widget_host.h
rowser/web_contents_observer.h
ommon/child_process_sandbox_support_linux.h
ommon/content_switches.cc
ommon/content_switches.h
ommon/favicon_url.cc
ommon/favicon_url.h
est/android/javatests/src/org/chromium/content/browser/test/util/OWNERS
est/browser_test_base.cc
est/browser_test_utils.cc
est/browser_test_utils.h
est/content_test_suite_base.cc
est/content_test_suite_base.h
est/layouttest_support.h
est/mock_render_thread.cc
est/render_view_test.cc
est/render_view_test.h
est/test_file_system_backend.cc
est/test_file_system_context.cc
est/test_file_system_context.h
est/test_launcher.cc
est/test_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/java/src/org/chromium/content/browser/ContentSettings.java
ndroid/java/src/org/chromium/content/browser/ContentVideoViewLegacy.java
ndroid/java/src/org/chromium/content/browser/ContentView.java
ndroid/java/src/org/chromium/content/browser/ContentViewClient.java
ndroid/java/src/org/chromium/content/browser/ContentViewCore.java
ndroid/java/src/org/chromium/content/browser/ContentViewGestureHandler.java
ndroid/java/src/org/chromium/content/browser/ContentViewRenderView.java
ndroid/java/src/org/chromium/content/browser/DeviceMotionAndOrientation.java
ndroid/java/src/org/chromium/content/browser/HeapStatsLogger.java
ndroid/java/src/org/chromium/content/browser/LoadUrlParams.java
ndroid/java/src/org/chromium/content/browser/MediaDrmCredentialManager.java
ndroid/java/src/org/chromium/content/browser/PageInfo.java
ndroid/java/src/org/chromium/content/browser/ResourceExtractor.java
ndroid/java/src/org/chromium/content/browser/ScreenOrientationListener.java
ndroid/java/src/org/chromium/content/browser/ScreenOrientationProvider.java
ndroid/java/src/org/chromium/content/browser/SnapScrollController.java
ndroid/java/src/org/chromium/content/browser/WebContentsObserverAndroid.java
ndroid/java/src/org/chromium/content/browser/accessibility/BrowserAccessibilityManager.java
ndroid/java/src/org/chromium/content/browser/accessibility/JellyBeanAccessibilityInjector.java
ndroid/java/src/org/chromium/content/browser/accessibility/KitKatBrowserAccessibilityManager.java
ndroid/java/src/org/chromium/content/browser/accessibility/OWNERS
ndroid/java/src/org/chromium/content/browser/input/AdapterInputConnection.java
ndroid/java/src/org/chromium/content/browser/input/HandleView.java
ndroid/java/src/org/chromium/content/browser/input/ImeAdapter.java
ndroid/java/src/org/chromium/content/browser/input/InputMethodManagerWrapper.java
ndroid/java/src/org/chromium/content/browser/input/SelectPopupDialog.java
ndroid/java/src/org/chromium/content/common/ContentSwitches.java
ndroid/java/src/org/chromium/content/common/ScreenOrientationValues.template
ndroid/java/src/org/chromium/content_public/Referrer.java
ndroid/javatests/src/org/chromium/content/browser/ClipboardTest.java
ndroid/javatests/src/org/chromium/content/browser/ContentViewCoreFocusTest.java
ndroid/javatests/src/org/chromium/content/browser/ContentViewGestureHandlerTest.java
ndroid/javatests/src/org/chromium/content/browser/DeviceMotionAndOrientationTest.java
ndroid/javatests/src/org/chromium/content/browser/JavaBridgeBasicsTest.java
ndroid/javatests/src/org/chromium/content/browser/ScreenOrientationIntegrationTest.java
ndroid/javatests/src/org/chromium/content/browser/ScreenOrientationListenerTest.java
ndroid/javatests/src/org/chromium/content/browser/ScreenOrientationProviderTest.java
ndroid/javatests/src/org/chromium/content/browser/ScreenOrientationTest.java
ndroid/javatests/src/org/chromium/content/browser/VSyncMonitorTest.java
ndroid/javatests/src/org/chromium/content/browser/ViewportTest.java
ndroid/javatests/src/org/chromium/content/browser/input/AdapterInputConnectionTest.java
ndroid/javatests/src/org/chromium/content/browser/input/ImeTest.java
ndroid/javatests/src/org/chromium/content/browser/input/InsertionHandleTest.java
ndroid/javatests/src/org/chromium/content/browser/input/SelectPopupTest.java
pp/content_main.h
pp/content_main_runner.h
pp/startup_helper_win.h
rowser/android/content_view_core.h
rowser/android/external_video_surface_container.h
rowser/android/synchronous_compositor_client.h
rowser/ax_event_notification_details.cc
rowser/ax_event_notification_details.h
rowser/browser_child_process_host.h
rowser/browser_child_process_observer.h
rowser/browser_context.h
rowser/browser_plugin_guest_delegate.h
rowser/browser_thread.h
rowser/content_browser_client.cc
rowser/content_browser_client.h
rowser/media_capture_devices.h
rowser/media_devices_monitor.h
rowser/media_observer.h
rowser/page_navigator.cc
rowser/page_navigator.h
rowser/render_frame_host.h
rowser/render_process_host.h
rowser/render_view_host.h
rowser/render_widget_host.h
rowser/resource_request_details.cc
rowser/resource_request_details.h
rowser/resource_request_info.h
rowser/speech_recognition_manager.h
rowser/speech_recognition_session_config.cc
rowser/speech_recognition_session_config.h
rowser/stream_handle.h
rowser/web_contents.h
rowser/web_contents_delegate.cc
rowser/web_contents_delegate.h
rowser/web_contents_observer.h
rowser/worker_service.h
ommon/OWNERS
ommon/assert_matching_enums.cc
ommon/common_param_traits.cc
ommon/common_param_traits.h
ommon/common_param_traits_macros.h
ommon/content_client.cc
ommon/content_client.h
ommon/content_switches.cc
ommon/content_switches.h
ommon/main_function_params.h
ommon/media_stream_request.cc
ommon/media_stream_request.h
ommon/p2p_socket_type.h
ommon/page_state.cc
ommon/sandbox_init.h
ommon/sandbox_linux.h
ommon/sandboxed_process_launcher_delegate.cc
ommon/sandboxed_process_launcher_delegate.h
ommon/screen_orientation_values.h
ommon/screen_orientation_values_list.h
ommon/url_constants.cc
ommon/url_constants.h
ommon/user_agent.h
ommon/webplugininfo.cc
enderer/DEPS
enderer/content_renderer_client.h
enderer/history_item_serialization.cc
enderer/key_system_info.h
enderer/media_stream_audio_sink.cc
enderer/p2p_socket_client.h
enderer/p2p_socket_client_delegate.h
enderer/render_frame.h
enderer/render_frame_observer.h
enderer/render_process_observer.h
enderer/render_thread.h
enderer/render_view.h
enderer/render_view_observer.h
enderer/video_encode_accelerator.cc
enderer/video_encode_accelerator.h
est/android/javatests/src/org/chromium/content/browser/test/util/CallbackHelper.java
est/android/javatests/src/org/chromium/content/browser/test/util/CriteriaHelper.java
est/android/javatests/src/org/chromium/content/browser/test/util/MockOrientationObserver.java
est/android/javatests/src/org/chromium/content/browser/test/util/OrientationChangeObserverCriteria.java
est/async_file_test_helper.cc
est/browser_test_base.cc
est/browser_test_base.h
est/browser_test_utils.cc
est/browser_test_utils.h
est/fake_speech_recognition_manager.cc
est/fake_speech_recognition_manager.h
est/mock_render_process_host.cc
est/mock_render_process_host.h
est/mock_render_thread.cc
est/mock_render_thread.h
est/render_view_test.cc
est/render_view_test.h
est/test_file_system_backend.cc
est/test_file_system_backend.h
est/test_launcher.cc
est/test_launcher.h
est/test_renderer_host.cc
est/test_renderer_host.h
est/test_utils.cc
est/test_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
ndroid/java/res/drawable-hdpi/bubble.9.png
ndroid/java/res/drawable-hdpi/bubble_arrow_up.png
ndroid/java/res/drawable-hdpi/pageinfo_warning_major.png
ndroid/java/res/drawable-xhdpi/bubble.9.png
ndroid/java/res/drawable-xhdpi/bubble_arrow_up.png
ndroid/java/res/drawable-xhdpi/ondemand_overlay.9.png
ndroid/java/res/drawable-xhdpi/pageinfo_warning_major.png
ndroid/java/res/drawable/bubble.9.png
ndroid/java/res/drawable/bubble_arrow_up.png
ndroid/java/res/drawable/pageinfo_warning_major.png
ndroid/java/res/layout/validation_message_bubble.xml
ndroid/java/resource_map/org/chromium/content/R.java
ndroid/java/src/org/chromium/content/app/ChildProcessService.java
ndroid/java/src/org/chromium/content/app/ChromiumLinkerParams.java
ndroid/java/src/org/chromium/content/app/ContentApplication.java
ndroid/java/src/org/chromium/content/app/LibraryLoader.java
ndroid/java/src/org/chromium/content/app/Linker.java
ndroid/java/src/org/chromium/content/app/LinkerParams.java
ndroid/java/src/org/chromium/content/browser/BindingManager.java
ndroid/java/src/org/chromium/content/browser/BindingManagerImpl.java
ndroid/java/src/org/chromium/content/browser/BrowserStartupController.java
ndroid/java/src/org/chromium/content/browser/ChildProcessConnection.java
ndroid/java/src/org/chromium/content/browser/ChildProcessConnectionImpl.java
ndroid/java/src/org/chromium/content/browser/ChildProcessLauncher.java
ndroid/java/src/org/chromium/content/browser/ContentVideoView.java
ndroid/java/src/org/chromium/content/browser/ContentVideoViewLegacy.java
ndroid/java/src/org/chromium/content/browser/ContentView.java
ndroid/java/src/org/chromium/content/browser/ContentViewClient.java
ndroid/java/src/org/chromium/content/browser/ContentViewCore.java
ndroid/java/src/org/chromium/content/browser/ContentViewGestureHandler.java
ndroid/java/src/org/chromium/content/browser/ContentViewRenderView.java
ndroid/java/src/org/chromium/content/browser/DeviceMotionAndOrientation.java
ndroid/java/src/org/chromium/content/browser/DeviceUtils.java
ndroid/java/src/org/chromium/content/browser/DownloadController.java
ndroid/java/src/org/chromium/content/browser/GestureEventType.template
ndroid/java/src/org/chromium/content/browser/LocationProvider.java
ndroid/java/src/org/chromium/content/browser/LocationProviderAdapter.java
ndroid/java/src/org/chromium/content/browser/LocationProviderFactory.java
ndroid/java/src/org/chromium/content/browser/LongPressDetector.java
ndroid/java/src/org/chromium/content/browser/MediaResourceGetter.java
ndroid/java/src/org/chromium/content/browser/NavigationController.java
ndroid/java/src/org/chromium/content/browser/PepperPluginManager.java
ndroid/java/src/org/chromium/content/browser/SnapScrollController.java
ndroid/java/src/org/chromium/content/browser/TouchEventSynthesizer.java
ndroid/java/src/org/chromium/content/browser/TouchPoint.java
ndroid/java/src/org/chromium/content/browser/TracingControllerAndroid.java
ndroid/java/src/org/chromium/content/browser/VSyncMonitor.java
ndroid/java/src/org/chromium/content/browser/VibrationProvider.java
ndroid/java/src/org/chromium/content/browser/WebContents.java
ndroid/java/src/org/chromium/content/browser/WebContentsObserverAndroid.java
ndroid/java/src/org/chromium/content/browser/ZoomManager.java
ndroid/java/src/org/chromium/content/browser/accessibility/BrowserAccessibilityManager.java
ndroid/java/src/org/chromium/content/browser/framehost/NavigationControllerImpl.java
ndroid/java/src/org/chromium/content/browser/input/AdapterInputConnection.java
ndroid/java/src/org/chromium/content/browser/input/ImeAdapter.java
ndroid/java/src/org/chromium/content/browser/input/InputDialogContainer.java
ndroid/java/src/org/chromium/content/browser/third_party/GestureDetector.java
ndroid/java/src/org/chromium/content/browser/webcontents/WebContentsImpl.java
ndroid/java/src/org/chromium/content/common/CleanupReference.java
ndroid/java/src/org/chromium/content/common/ContentSwitches.java
ndroid/java/src/org/chromium/content/common/PerfTraceEvent.java
ndroid/java/src/org/chromium/content/common/ProcessInitException.java
ndroid/java/src/org/chromium/content/common/TraceEvent.java
ndroid/java/src/org/chromium/content_public/DEPS
ndroid/java/src/org/chromium/content_public/browser/GestureStateListener.java
ndroid/java/src/org/chromium/content_public/browser/NavigationController.java
ndroid/java/src/org/chromium/content_public/browser/WebContents.java
ndroid/java/strings/android_content_strings.grd
ndroid/java/strings/translations/android_content_strings_am.xtb
ndroid/java/strings/translations/android_content_strings_ar.xtb
ndroid/java/strings/translations/android_content_strings_bg.xtb
ndroid/java/strings/translations/android_content_strings_ca.xtb
ndroid/java/strings/translations/android_content_strings_cs.xtb
ndroid/java/strings/translations/android_content_strings_da.xtb
ndroid/java/strings/translations/android_content_strings_de.xtb
ndroid/java/strings/translations/android_content_strings_el.xtb
ndroid/java/strings/translations/android_content_strings_en-GB.xtb
ndroid/java/strings/translations/android_content_strings_es-419.xtb
ndroid/java/strings/translations/android_content_strings_es.xtb
ndroid/java/strings/translations/android_content_strings_fa.xtb
ndroid/java/strings/translations/android_content_strings_fi.xtb
ndroid/java/strings/translations/android_content_strings_fil.xtb
ndroid/java/strings/translations/android_content_strings_fr.xtb
ndroid/java/strings/translations/android_content_strings_hi.xtb
ndroid/java/strings/translations/android_content_strings_hr.xtb
ndroid/java/strings/translations/android_content_strings_hu.xtb
ndroid/java/strings/translations/android_content_strings_id.xtb
ndroid/java/strings/translations/android_content_strings_it.xtb
ndroid/java/strings/translations/android_content_strings_iw.xtb
ndroid/java/strings/translations/android_content_strings_ja.xtb
ndroid/java/strings/translations/android_content_strings_ko.xtb
ndroid/java/strings/translations/android_content_strings_lt.xtb
ndroid/java/strings/translations/android_content_strings_lv.xtb
ndroid/java/strings/translations/android_content_strings_nl.xtb
ndroid/java/strings/translations/android_content_strings_no.xtb
ndroid/java/strings/translations/android_content_strings_pl.xtb
ndroid/java/strings/translations/android_content_strings_pt-BR.xtb
ndroid/java/strings/translations/android_content_strings_pt-PT.xtb
ndroid/java/strings/translations/android_content_strings_ro.xtb
ndroid/java/strings/translations/android_content_strings_ru.xtb
ndroid/java/strings/translations/android_content_strings_sk.xtb
ndroid/java/strings/translations/android_content_strings_sl.xtb
ndroid/java/strings/translations/android_content_strings_sr.xtb
ndroid/java/strings/translations/android_content_strings_sv.xtb
ndroid/java/strings/translations/android_content_strings_sw.xtb
ndroid/java/strings/translations/android_content_strings_th.xtb
ndroid/java/strings/translations/android_content_strings_tr.xtb
ndroid/java/strings/translations/android_content_strings_uk.xtb
ndroid/java/strings/translations/android_content_strings_vi.xtb
ndroid/java/strings/translations/android_content_strings_zh-CN.xtb
ndroid/java/strings/translations/android_content_strings_zh-TW.xtb
ndroid/java/templates/NativeLibraries.template
ndroid/java/templates/native_libraries_array.h
ndroid/java/templates/native_libraries_version.h
ndroid/javatests/src/org/chromium/content/browser/BindingManagerImplTest.java
ndroid/javatests/src/org/chromium/content/browser/BindingManagerTest.java
ndroid/javatests/src/org/chromium/content/browser/BrowserStartupControllerTest.java
ndroid/javatests/src/org/chromium/content/browser/ClickListenerTest.java
ndroid/javatests/src/org/chromium/content/browser/ContentCommandLineTest.java
ndroid/javatests/src/org/chromium/content/browser/ContentDetectionTestBase.java
ndroid/javatests/src/org/chromium/content/browser/ContentViewCoreDpadTest.java
ndroid/javatests/src/org/chromium/content/browser/ContentViewGestureHandlerTest.java
ndroid/javatests/src/org/chromium/content/browser/ContentViewLocationTest.java
ndroid/javatests/src/org/chromium/content/browser/GestureDetectorResetTest.java
ndroid/javatests/src/org/chromium/content/browser/ImportantFileWriterAndroidTest.java
ndroid/javatests/src/org/chromium/content/browser/LocationProviderTest.java
ndroid/javatests/src/org/chromium/content/browser/LongPressDetectorTest.java
ndroid/javatests/src/org/chromium/content/browser/ScreenOrientationTest.java
ndroid/javatests/src/org/chromium/content/browser/TracingControllerAndroidTest.java
ndroid/javatests/src/org/chromium/content/browser/input/AdapterInputConnectionTest.java
ndroid/javatests/src/org/chromium/content/browser/input/ImeTest.java
ndroid/javatests/src/org/chromium/content/browser/input/SelectPopupTest.java
pp/android_library_loader_hooks.h
rowser/android/compositor.h
rowser/android/content_view_core.h
rowser/android/synchronous_compositor.h
rowser/android/synchronous_compositor_client.h
rowser/browser_accessibility_state.h
rowser/browser_child_process_host.h
rowser/browser_child_process_host_delegate.h
rowser/browser_context.h
rowser/browser_message_filter.cc
rowser/browser_message_filter.h
rowser/browser_plugin_guest_delegate.h
rowser/browser_ppapi_host.h
rowser/child_process_data.h
rowser/content_browser_client.cc
rowser/content_browser_client.h
rowser/cookie_crypto_delegate.h
rowser/cookie_store_factory.h
rowser/desktop_media_id.cc
rowser/desktop_media_id.h
rowser/download_interrupt_reason_values.h
rowser/download_interrupt_reasons.h
rowser/download_item.h
rowser/download_url_parameters.h
rowser/media_device_id.cc
rowser/media_device_id.h
rowser/media_observer.h
rowser/navigation_controller.h
rowser/navigation_details.h
rowser/navigation_entry.h
rowser/notification_types.h
rowser/plugin_service.h
rowser/render_frame_host.h
rowser/render_process_host.h
rowser/render_process_host_observer.h
rowser/render_view_host.h
rowser/render_widget_host.h
rowser/render_widget_host_view.h
rowser/resource_context.h
rowser/resource_dispatcher_host.h
rowser/resource_dispatcher_host_delegate.cc
rowser/resource_dispatcher_host_delegate.h
rowser/resource_request_details.cc
rowser/resource_request_details.h
rowser/resource_request_info.h
rowser/resource_throttle.h
rowser/storage_partition.h
rowser/url_data_source.cc
rowser/url_data_source.h
rowser/user_metrics.h
rowser/utility_process_host.h
rowser/utility_process_host_client.h
rowser/web_contents.h
rowser/web_contents_delegate.cc
rowser/web_contents_delegate.h
rowser/web_contents_observer.h
rowser/web_contents_view_delegate.h
rowser/web_drag_dest_delegate.h
ommon/bindings_policy.h
ommon/child_process_host.h
ommon/child_process_host_delegate.h
ommon/common_param_traits.cc
ommon/common_param_traits.h
ommon/common_param_traits_macros.h
ommon/console_message_level.h
ommon/content_constants.cc
ommon/content_constants.h
ommon/content_switches.cc
ommon/content_switches.h
ommon/context_menu_params.cc
ommon/desktop_media_id.cc
ommon/desktop_media_id.h
ommon/geoposition.h
ommon/media_stream_request.h
ommon/p2p_socket_type.h
ommon/page_state.cc
ommon/page_state.h
ommon/pepper_plugin_info.cc
ommon/result_codes_list.h
ommon/sandbox_linux.h
ommon/security_style.h
ommon/socket_permission_request.h
ommon/speech_recognition_error.h
ommon/speech_recognition_error_list.h
ommon/url_constants.cc
ommon/url_constants.h
ommon/url_fetcher.h
ommon/url_utils.cc
ommon/url_utils.h
ommon/user_metrics_action.h
ommon/webplugininfo.cc
enderer/DEPS
enderer/android/OWNERS
enderer/content_renderer_client.cc
enderer/content_renderer_client.h
enderer/history_item_serialization.cc
enderer/media_stream_audio_sink.cc
enderer/media_stream_audio_sink.h
enderer/media_stream_sink.h
enderer/media_stream_video_sink.h
enderer/p2p_socket_client.h
enderer/p2p_socket_client_delegate.h
enderer/pepper_plugin_instance.h
enderer/render_frame.h
enderer/render_frame_observer.h
enderer/render_thread.h
enderer/render_view_observer.h
enderer/resource_fetcher.h
enderer/video_encode_accelerator.cc
enderer/video_encode_accelerator.h
est/DEPS
est/android/javatests/src/org/chromium/content/browser/test/util/CallbackHelper.java
est/android/javatests/src/org/chromium/content/browser/test/util/CriteriaHelper.java
est/android/javatests/src/org/chromium/content/browser/test/util/HistoryUtils.java
est/android/javatests/src/org/chromium/content/browser/test/util/JavaScriptUtils.java
est/android/javatests/src/org/chromium/content/browser/test/util/MockLocationProvider.java
est/android/javatests/src/org/chromium/content/browser/test/util/UiUtils.java
est/async_file_test_helper.cc
est/async_file_test_helper.h
est/browser_test_base.cc
est/browser_test_base.h
est/browser_test_utils.cc
est/browser_test_utils.h
est/download_test_observer.cc
est/download_test_observer.h
est/fake_speech_recognition_manager.cc
est/mock_blob_url_request_context.cc
est/mock_blob_url_request_context.h
est/mock_download_item.h
est/mock_render_process_host.cc
est/mock_render_process_host.h
est/mock_render_thread.cc
est/mock_render_thread.h
est/render_view_test.cc
est/render_view_test.h
est/render_widget_test.cc
est/render_widget_test.h
est/sandbox_file_system_test_helper.cc
est/sandbox_file_system_test_helper.h
est/test_browser_context.cc
est/test_browser_context.h
est/test_file_system_backend.cc
est/test_file_system_backend.h
est/test_file_system_context.cc
est/test_file_system_context.h
est/test_file_system_options.cc
est/test_file_system_options.h
est/test_launcher.cc
est/test_launcher.h
est/test_renderer_host.cc
est/test_utils.cc
est/test_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/OWNERS
ndroid/java/resource_map/OWNERS
ndroid/java/resource_map/org/chromium/content/R.java
ndroid/java/src/org/chromium/content/app/ChildProcessService.java
ndroid/java/src/org/chromium/content/app/ContentApplication.java
ndroid/java/src/org/chromium/content/app/ContentMain.java
ndroid/java/src/org/chromium/content/app/LibraryLoader.java
ndroid/java/src/org/chromium/content/app/Linker.java
ndroid/java/src/org/chromium/content/app/PrivilegedProcessService.java
ndroid/java/src/org/chromium/content/app/PrivilegedProcessService0.java
ndroid/java/src/org/chromium/content/app/PrivilegedProcessService1.java
ndroid/java/src/org/chromium/content/app/PrivilegedProcessService2.java
ndroid/java/src/org/chromium/content/app/SandboxedProcessService.java
ndroid/java/src/org/chromium/content/app/SandboxedProcessService0.java
ndroid/java/src/org/chromium/content/app/SandboxedProcessService1.java
ndroid/java/src/org/chromium/content/app/SandboxedProcessService10.java
ndroid/java/src/org/chromium/content/app/SandboxedProcessService11.java
ndroid/java/src/org/chromium/content/app/SandboxedProcessService12.java
ndroid/java/src/org/chromium/content/app/SandboxedProcessService2.java
ndroid/java/src/org/chromium/content/app/SandboxedProcessService3.java
ndroid/java/src/org/chromium/content/app/SandboxedProcessService4.java
ndroid/java/src/org/chromium/content/app/SandboxedProcessService5.java
ndroid/java/src/org/chromium/content/app/SandboxedProcessService6.java
ndroid/java/src/org/chromium/content/app/SandboxedProcessService7.java
ndroid/java/src/org/chromium/content/app/SandboxedProcessService8.java
ndroid/java/src/org/chromium/content/app/SandboxedProcessService9.java
ndroid/java/src/org/chromium/content/browser/ActivityContentVideoViewClient.java
ndroid/java/src/org/chromium/content/browser/BindingManager.java
ndroid/java/src/org/chromium/content/browser/BrowserStartupController.java
ndroid/java/src/org/chromium/content/browser/ChildProcessConnection.java
ndroid/java/src/org/chromium/content/browser/ChildProcessConnectionImpl.java
ndroid/java/src/org/chromium/content/browser/ChildProcessLauncher.java
ndroid/java/src/org/chromium/content/browser/ContentSettings.java
ndroid/java/src/org/chromium/content/browser/ContentVideoView.java
ndroid/java/src/org/chromium/content/browser/ContentVideoViewClient.java
ndroid/java/src/org/chromium/content/browser/ContentVideoViewControls.java
ndroid/java/src/org/chromium/content/browser/ContentView.java
ndroid/java/src/org/chromium/content/browser/ContentViewClient.java
ndroid/java/src/org/chromium/content/browser/ContentViewCore.java
ndroid/java/src/org/chromium/content/browser/ContentViewDownloadDelegate.java
ndroid/java/src/org/chromium/content/browser/ContentViewGestureHandler.java
ndroid/java/src/org/chromium/content/browser/ContentViewRenderView.java
ndroid/java/src/org/chromium/content/browser/ContentViewStatics.java
ndroid/java/src/org/chromium/content/browser/DeviceMotionAndOrientation.java
ndroid/java/src/org/chromium/content/browser/DeviceUtils.java
ndroid/java/src/org/chromium/content/browser/DownloadController.java
ndroid/java/src/org/chromium/content/browser/FileDescriptorInfo.java
ndroid/java/src/org/chromium/content/browser/HeapStatsLogger.java
ndroid/java/src/org/chromium/content/browser/InterstitialPageDelegateAndroid.java
ndroid/java/src/org/chromium/content/browser/JavascriptInterface.java
ndroid/java/src/org/chromium/content/browser/JellyBeanContentView.java
ndroid/java/src/org/chromium/content/browser/LoadUrlParams.java
ndroid/java/src/org/chromium/content/browser/LocationProvider.java
ndroid/java/src/org/chromium/content/browser/LongPressDetector.java
ndroid/java/src/org/chromium/content/browser/MediaResourceGetter.java
ndroid/java/src/org/chromium/content/browser/NavigationClient.java
ndroid/java/src/org/chromium/content/browser/NavigationController.java
ndroid/java/src/org/chromium/content/browser/NavigationEntry.java
ndroid/java/src/org/chromium/content/browser/NavigationHistory.java
ndroid/java/src/org/chromium/content/browser/PageInfo.java
ndroid/java/src/org/chromium/content/browser/PageTransitionTypes.template
ndroid/java/src/org/chromium/content/browser/PepperPluginManager.java
ndroid/java/src/org/chromium/content/browser/PopupZoomer.java
ndroid/java/src/org/chromium/content/browser/RenderCoordinates.java
ndroid/java/src/org/chromium/content/browser/ResourceExtractor.java
ndroid/java/src/org/chromium/content/browser/SelectActionModeCallback.java
ndroid/java/src/org/chromium/content/browser/SnapScrollController.java
ndroid/java/src/org/chromium/content/browser/SpeechRecognition.java
ndroid/java/src/org/chromium/content/browser/TouchPoint.java
ndroid/java/src/org/chromium/content/browser/VSyncManager.java
ndroid/java/src/org/chromium/content/browser/VSyncMonitor.java
ndroid/java/src/org/chromium/content/browser/WebContents.java
ndroid/java/src/org/chromium/content/browser/WebContentsObserverAndroid.java
ndroid/java/src/org/chromium/content/browser/ZoomManager.java
ndroid/java/src/org/chromium/content/browser/accessibility/AccessibilityInjector.java
ndroid/java/src/org/chromium/content/browser/accessibility/BrowserAccessibilityManager.java
ndroid/java/src/org/chromium/content/browser/accessibility/JellyBeanAccessibilityInjector.java
ndroid/java/src/org/chromium/content/browser/accessibility/KitKatBrowserAccessibilityManager.java
ndroid/java/src/org/chromium/content/browser/framehost/NavigationControllerImpl.java
ndroid/java/src/org/chromium/content/browser/input/AdapterInputConnection.java
ndroid/java/src/org/chromium/content/browser/input/CursorController.java
ndroid/java/src/org/chromium/content/browser/input/DateDialogNormalizer.java
ndroid/java/src/org/chromium/content/browser/input/DateTimeChooserAndroid.java
ndroid/java/src/org/chromium/content/browser/input/DateTimePickerDialog.java
ndroid/java/src/org/chromium/content/browser/input/DateTimeSuggestion.java
ndroid/java/src/org/chromium/content/browser/input/DateTimeSuggestionListAdapter.java
ndroid/java/src/org/chromium/content/browser/input/HandleView.java
ndroid/java/src/org/chromium/content/browser/input/InputDialogContainer.java
ndroid/java/src/org/chromium/content/browser/input/InputMethodManagerWrapper.java
ndroid/java/src/org/chromium/content/browser/input/InsertionHandleController.java
ndroid/java/src/org/chromium/content/browser/input/MonthPicker.java
ndroid/java/src/org/chromium/content/browser/input/MonthPickerDialog.java
ndroid/java/src/org/chromium/content/browser/input/PopupItemType.template
ndroid/java/src/org/chromium/content/browser/input/SelectPopupAdapter.java
ndroid/java/src/org/chromium/content/browser/input/SelectPopupDialog.java
ndroid/java/src/org/chromium/content/browser/input/SelectPopupItem.java
ndroid/java/src/org/chromium/content/browser/input/SelectionHandleController.java
ndroid/java/src/org/chromium/content/browser/input/TwoFieldDatePicker.java
ndroid/java/src/org/chromium/content/browser/input/TwoFieldDatePickerDialog.java
ndroid/java/src/org/chromium/content/browser/input/WeekPicker.java
ndroid/java/src/org/chromium/content/browser/input/WeekPickerDialog.java
ndroid/java/src/org/chromium/content/browser/webcontents/WebContentsImpl.java
ndroid/java/src/org/chromium/content/common/CleanupReference.java
ndroid/java/src/org/chromium/content/common/ContentSwitches.java
ndroid/java/src/org/chromium/content/common/DeviceTelephonyInfo.java
ndroid/java/src/org/chromium/content/common/IChildProcessCallback.aidl
ndroid/java/src/org/chromium/content/common/IChildProcessService.aidl
ndroid/java/src/org/chromium/content/common/PerfTraceEvent.java
ndroid/java/src/org/chromium/content/common/ProcessInitException.java
ndroid/java/src/org/chromium/content/common/ResultCodes.template
ndroid/java/src/org/chromium/content/common/TopControlsState.template
ndroid/java/src/org/chromium/content/common/TraceEvent.java
ndroid/java/src/org/chromium/content/common/common.aidl
ndroid/java/strings/android_content_strings.grd
ndroid/java/templates/NativeLibraries.template
ndroid/java/templates/native_libraries_array.h
ndroid/java/templates/native_libraries_version.h
ndroid/javatests/src/org/chromium/content/browser/AddressDetectionTest.java
ndroid/javatests/src/org/chromium/content/browser/BindingManagerTest.java
ndroid/javatests/src/org/chromium/content/browser/BrowserStartupControllerTest.java
ndroid/javatests/src/org/chromium/content/browser/ClickListenerTest.java
ndroid/javatests/src/org/chromium/content/browser/ClipboardTest.java
ndroid/javatests/src/org/chromium/content/browser/ContentCommandLineTest.java
ndroid/javatests/src/org/chromium/content/browser/ContentDetectionTestBase.java
ndroid/javatests/src/org/chromium/content/browser/ContentViewGestureHandlerTest.java
ndroid/javatests/src/org/chromium/content/browser/ContentViewPopupZoomerTest.java
ndroid/javatests/src/org/chromium/content/browser/ContentViewScrollingTest.java
ndroid/javatests/src/org/chromium/content/browser/ContentViewTestBase.java
ndroid/javatests/src/org/chromium/content/browser/DeviceMotionAndOrientationTest.java
ndroid/javatests/src/org/chromium/content/browser/EmailAddressDetectionTest.java
ndroid/javatests/src/org/chromium/content/browser/EncodeHtmlDataUriTest.java
ndroid/javatests/src/org/chromium/content/browser/GestureDetectorResetTest.java
ndroid/javatests/src/org/chromium/content/browser/ImportantFileWriterAndroidTest.java
ndroid/javatests/src/org/chromium/content/browser/InterstitialPageTest.java
ndroid/javatests/src/org/chromium/content/browser/JavaBridgeArrayCoercionTest.java
ndroid/javatests/src/org/chromium/content/browser/JavaBridgeArrayTest.java
ndroid/javatests/src/org/chromium/content/browser/JavaBridgeBasicsTest.java
ndroid/javatests/src/org/chromium/content/browser/JavaBridgeChildFrameTest.java
ndroid/javatests/src/org/chromium/content/browser/JavaBridgeCoercionTest.java
ndroid/javatests/src/org/chromium/content/browser/JavaBridgeFieldsTest.java
ndroid/javatests/src/org/chromium/content/browser/JavaBridgeReturnValuesTest.java
ndroid/javatests/src/org/chromium/content/browser/JavaBridgeTestBase.java
ndroid/javatests/src/org/chromium/content/browser/LocationProviderTest.java
ndroid/javatests/src/org/chromium/content/browser/LongPressDetectorTest.java
ndroid/javatests/src/org/chromium/content/browser/NavigationTest.java
ndroid/javatests/src/org/chromium/content/browser/PhoneNumberDetectionTest.java
ndroid/javatests/src/org/chromium/content/browser/PopupZoomerTest.java
ndroid/javatests/src/org/chromium/content/browser/TestsJavaScriptEvalTest.java
ndroid/javatests/src/org/chromium/content/browser/TracingControllerAndroidTest.java
ndroid/javatests/src/org/chromium/content/browser/VSyncMonitorTest.java
ndroid/javatests/src/org/chromium/content/browser/ViewportTest.java
ndroid/javatests/src/org/chromium/content/browser/input/ImeTest.java
ndroid/javatests/src/org/chromium/content/browser/input/InputDialogContainerTest.java
ndroid/javatests/src/org/chromium/content/browser/input/InsertionHandleTest.java
ndroid/javatests/src/org/chromium/content/browser/input/SelectPopupTest.java
ndroid/javatests/src/org/chromium/content/browser/input/SelectionHandleTest.java
pp/android_library_loader_hooks.h
rowser/access_token_store.h
rowser/browser_child_process_host.h
rowser/browser_child_process_host_iterator.cc
rowser/browser_child_process_host_iterator.h
rowser/browser_message_filter.cc
rowser/browser_plugin_guest_delegate.h
rowser/child_process_data.h
rowser/content_browser_client.cc
rowser/content_browser_client.h
rowser/download_save_info.h
rowser/download_url_parameters.h
rowser/javascript_dialog_manager.cc
rowser/javascript_dialog_manager.h
rowser/media_device_id.cc
rowser/media_device_id.h
rowser/navigation_entry.h
rowser/plugin_service.h
rowser/plugin_service_filter.h
rowser/render_frame_host.h
rowser/render_view_host.h
rowser/render_widget_host.h
rowser/render_widget_host_view.h
rowser/render_widget_host_view_mac_delegate.h
rowser/resource_context.h
rowser/resource_request_info.h
rowser/resource_throttle.h
rowser/speech_recognition_manager.h
rowser/trace_controller.h
rowser/trace_subscriber.h
rowser/tracing_controller.h
rowser/user_metrics.h
rowser/web_contents.h
rowser/web_contents_delegate.cc
rowser/web_contents_delegate.h
rowser/web_contents_observer.h
rowser/web_contents_view.h
rowser/web_drag_dest_delegate.h
rowser/web_ui.h
rowser/web_ui_data_source.h
rowser/web_ui_message_handler.h
rowser/worker_service.h
rowser/worker_service_observer.h
ommon/color_suggestion.cc
ommon/color_suggestion.h
ommon/content_client.cc
ommon/content_client.h
ommon/content_switches.cc
ommon/content_switches.h
ommon/context_menu_params.cc
ommon/context_menu_params.h
ommon/file_chooser_params.h
ommon/media_stream_request.cc
ommon/media_stream_request.h
ommon/p2p_socket_type.h
ommon/result_codes_list.h
ommon/sandbox_init.h
ommon/sandbox_linux.h
ommon/show_desktop_notification_params.cc
ommon/show_desktop_notification_params.h
ommon/signed_certificate_timestamp_id_and_status.cc
ommon/signed_certificate_timestamp_id_and_status.h
ommon/speech_recognition_result.h
ommon/ssl_status.cc
ommon/ssl_status.h
ommon/url_constants.cc
ommon/url_constants.h
ommon/user_metrics_action.h
ommon/webplugininfo.cc
lugin/content_plugin_client.h
enderer/android/OWNERS
enderer/content_renderer_client.cc
enderer/content_renderer_client.h
enderer/media_stream_audio_sink.cc
enderer/media_stream_audio_sink.h
enderer/media_stream_sink.h
enderer/media_stream_video_sink.cc
enderer/media_stream_video_sink.h
enderer/p2p_socket_client.h
enderer/p2p_socket_client_delegate.h
enderer/render_frame.h
enderer/render_frame_observer.cc
enderer/render_frame_observer.h
enderer/render_frame_observer_tracker.h
enderer/render_thread.h
enderer/render_view.h
enderer/render_view_observer.h
enderer/renderer_ppapi_host.h
enderer/v8_value_converter.h
est/android/javatests/src/org/chromium/content/browser/test/NestedSystemMessageHandler.java
est/android/javatests/src/org/chromium/content/browser/test/util/CallbackHelper.java
est/android/javatests/src/org/chromium/content/browser/test/util/Criteria.java
est/android/javatests/src/org/chromium/content/browser/test/util/CriteriaHelper.java
est/android/javatests/src/org/chromium/content/browser/test/util/DOMUtils.java
est/android/javatests/src/org/chromium/content/browser/test/util/HistoryUtils.java
est/android/javatests/src/org/chromium/content/browser/test/util/JavaScriptUtils.java
est/android/javatests/src/org/chromium/content/browser/test/util/KeyUtils.java
est/android/javatests/src/org/chromium/content/browser/test/util/TestCallbackHelperContainer.java
est/android/javatests/src/org/chromium/content/browser/test/util/TestContentViewClient.java
est/android/javatests/src/org/chromium/content/browser/test/util/TestContentViewClientWrapper.java
est/android/javatests/src/org/chromium/content/browser/test/util/TestInputMethodManagerWrapper.java
est/android/javatests/src/org/chromium/content/browser/test/util/TestTouchUtils.java
est/android/javatests/src/org/chromium/content/browser/test/util/TestWebContentsObserver.java
est/android/javatests/src/org/chromium/content/browser/test/util/TouchCommon.java
est/android/javatests/src/org/chromium/content/browser/test/util/UiUtils.java
est/browser_test_base.cc
est/browser_test_utils.cc
est/browser_test_utils.h
est/fake_speech_recognition_manager.cc
est/fake_speech_recognition_manager.h
est/mock_render_process_host.cc
est/mock_render_process_host.h
est/mock_render_thread.cc
est/mock_render_thread.h
est/render_view_test.cc
est/render_view_test.h
est/render_widget_test.h
est/test_launcher.cc
est/test_renderer_host.cc
est/test_renderer_host.h
est/test_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
ndroid/OWNERS
ndroid/java/res/drawable-hdpi/ic_menu_search_holo_light.png
ndroid/java/res/drawable-hdpi/ic_menu_share_holo_light.png
ndroid/java/res/drawable-hdpi/ondemand_overlay.9.png
ndroid/java/res/drawable-xhdpi/ic_menu_search_holo_light.png
ndroid/java/res/drawable-xhdpi/ic_menu_share_holo_light.png
ndroid/java/res/drawable-xhdpi/ondemand_overlay.9.png
ndroid/java/res/drawable/ic_menu_search_holo_light.png
ndroid/java/res/drawable/ic_menu_share_holo_light.png
ndroid/java/res/drawable/ondemand_overlay.9.png
ndroid/java/res/mipmap-hdpi/app_icon.png
ndroid/java/res/mipmap-mdpi/app_icon.png
ndroid/java/res/mipmap-xhdpi/app_icon.png
ndroid/java/res/mipmap-xxhdpi/app_icon.png
ndroid/java/src/org/chromium/content/app/LibraryLoader.java
ndroid/java/src/org/chromium/content/app/Linker.java
ndroid/java/src/org/chromium/content/browser/ActivityContentVideoViewClient.java
ndroid/java/src/org/chromium/content/browser/BrowserStartupController.java
ndroid/java/src/org/chromium/content/browser/ChildProcessConnection.java
ndroid/java/src/org/chromium/content/browser/ChildProcessLauncher.java
ndroid/java/src/org/chromium/content/browser/ContentSettings.java
ndroid/java/src/org/chromium/content/browser/ContentVideoView.java
ndroid/java/src/org/chromium/content/browser/ContentVideoViewControls.java
ndroid/java/src/org/chromium/content/browser/ContentView.java
ndroid/java/src/org/chromium/content/browser/ContentViewClient.java
ndroid/java/src/org/chromium/content/browser/ContentViewCore.java
ndroid/java/src/org/chromium/content/browser/ContentViewDownloadDelegate.java
ndroid/java/src/org/chromium/content/browser/ContentViewGestureHandler.java
ndroid/java/src/org/chromium/content/browser/ContentViewRenderView.java
ndroid/java/src/org/chromium/content/browser/DeviceMotionAndOrientation.java
ndroid/java/src/org/chromium/content/browser/DeviceUtils.java
ndroid/java/src/org/chromium/content/browser/DownloadController.java
ndroid/java/src/org/chromium/content/browser/DownloadInfo.java
ndroid/java/src/org/chromium/content/browser/FileDescriptorInfo.java
ndroid/java/src/org/chromium/content/browser/GenericTouchGesture.java
ndroid/java/src/org/chromium/content/browser/HeapStatsLogger.java
ndroid/java/src/org/chromium/content/browser/InterstitialPageDelegateAndroid.java
ndroid/java/src/org/chromium/content/browser/JellyBeanContentView.java
ndroid/java/src/org/chromium/content/browser/LongPressDetector.java
ndroid/java/src/org/chromium/content/browser/NavigationHistory.java
ndroid/java/src/org/chromium/content/browser/OWNERS
ndroid/java/src/org/chromium/content/browser/PepperPluginManager.java
ndroid/java/src/org/chromium/content/browser/PopupZoomer.java
ndroid/java/src/org/chromium/content/browser/PowerSaveBlocker.java
ndroid/java/src/org/chromium/content/browser/ResourceExtractor.java
ndroid/java/src/org/chromium/content/browser/SelectActionModeCallback.java
ndroid/java/src/org/chromium/content/browser/SpeechRecognition.java
ndroid/java/src/org/chromium/content/browser/TouchEventSynthesizer.java
ndroid/java/src/org/chromium/content/browser/TouchPoint.java
ndroid/java/src/org/chromium/content/browser/TracingControllerAndroid.java
ndroid/java/src/org/chromium/content/browser/VSyncMonitor.java
ndroid/java/src/org/chromium/content/browser/VibrationMessageFilter.java
ndroid/java/src/org/chromium/content/browser/VibrationProvider.java
ndroid/java/src/org/chromium/content/browser/ViewPositionObserver.java
ndroid/java/src/org/chromium/content/browser/WebContentsObserverAndroid.java
ndroid/java/src/org/chromium/content/browser/ZoomManager.java
ndroid/java/src/org/chromium/content/browser/accessibility/AccessibilityInjector.java
ndroid/java/src/org/chromium/content/browser/accessibility/BrowserAccessibilityManager.java
ndroid/java/src/org/chromium/content/browser/accessibility/JellyBeanAccessibilityInjector.java
ndroid/java/src/org/chromium/content/browser/accessibility/JellyBeanBrowserAccessibilityManager.java
ndroid/java/src/org/chromium/content/browser/input/AdapterInputConnection.java
ndroid/java/src/org/chromium/content/browser/input/DateDialogNormalizer.java
ndroid/java/src/org/chromium/content/browser/input/DateTimeChooserAndroid.java
ndroid/java/src/org/chromium/content/browser/input/DateTimePickerDialog.java
ndroid/java/src/org/chromium/content/browser/input/HandleView.java
ndroid/java/src/org/chromium/content/browser/input/ImeAdapter.java
ndroid/java/src/org/chromium/content/browser/input/InputDialogContainer.java
ndroid/java/src/org/chromium/content/browser/input/InsertionHandleController.java
ndroid/java/src/org/chromium/content/browser/input/MonthPicker.java
ndroid/java/src/org/chromium/content/browser/input/MultiFieldTimePickerDialog.java
ndroid/java/src/org/chromium/content/browser/input/SelectPopupDialog.java
ndroid/java/src/org/chromium/content/browser/input/TwoFieldDatePicker.java
ndroid/java/src/org/chromium/content/browser/input/TwoFieldDatePickerDialog.java
ndroid/java/src/org/chromium/content/browser/input/WeekPicker.java
ndroid/java/src/org/chromium/content/browser/third_party/GestureDetector.java
ndroid/java/src/org/chromium/content/common/CommandLine.java
ndroid/java/src/org/chromium/content/common/ContentSwitches.java
ndroid/java/src/org/chromium/content/common/TraceEvent.java
ndroid/java/strings/translations/android_content_strings_am.xtb
ndroid/java/strings/translations/android_content_strings_ar.xtb
ndroid/java/strings/translations/android_content_strings_bg.xtb
ndroid/java/strings/translations/android_content_strings_ca.xtb
ndroid/java/strings/translations/android_content_strings_cs.xtb
ndroid/java/strings/translations/android_content_strings_da.xtb
ndroid/java/strings/translations/android_content_strings_de.xtb
ndroid/java/strings/translations/android_content_strings_el.xtb
ndroid/java/strings/translations/android_content_strings_en-GB.xtb
ndroid/java/strings/translations/android_content_strings_es-419.xtb
ndroid/java/strings/translations/android_content_strings_es.xtb
ndroid/java/strings/translations/android_content_strings_fa.xtb
ndroid/java/strings/translations/android_content_strings_fi.xtb
ndroid/java/strings/translations/android_content_strings_fil.xtb
ndroid/java/strings/translations/android_content_strings_fr.xtb
ndroid/java/strings/translations/android_content_strings_hi.xtb
ndroid/java/strings/translations/android_content_strings_hr.xtb
ndroid/java/strings/translations/android_content_strings_hu.xtb
ndroid/java/strings/translations/android_content_strings_id.xtb
ndroid/java/strings/translations/android_content_strings_it.xtb
ndroid/java/strings/translations/android_content_strings_iw.xtb
ndroid/java/strings/translations/android_content_strings_ja.xtb
ndroid/java/strings/translations/android_content_strings_ko.xtb
ndroid/java/strings/translations/android_content_strings_lt.xtb
ndroid/java/strings/translations/android_content_strings_lv.xtb
ndroid/java/strings/translations/android_content_strings_nl.xtb
ndroid/java/strings/translations/android_content_strings_no.xtb
ndroid/java/strings/translations/android_content_strings_pl.xtb
ndroid/java/strings/translations/android_content_strings_pt-BR.xtb
ndroid/java/strings/translations/android_content_strings_pt-PT.xtb
ndroid/java/strings/translations/android_content_strings_ro.xtb
ndroid/java/strings/translations/android_content_strings_ru.xtb
ndroid/java/strings/translations/android_content_strings_sk.xtb
ndroid/java/strings/translations/android_content_strings_sl.xtb
ndroid/java/strings/translations/android_content_strings_sr.xtb
ndroid/java/strings/translations/android_content_strings_sv.xtb
ndroid/java/strings/translations/android_content_strings_sw.xtb
ndroid/java/strings/translations/android_content_strings_th.xtb
ndroid/java/strings/translations/android_content_strings_tr.xtb
ndroid/java/strings/translations/android_content_strings_uk.xtb
ndroid/java/strings/translations/android_content_strings_vi.xtb
ndroid/java/strings/translations/android_content_strings_zh-CN.xtb
ndroid/java/strings/translations/android_content_strings_zh-TW.xtb
ndroid/javatests/src/org/chromium/content/browser/CommandLineTest.java
ndroid/javatests/src/org/chromium/content/browser/ContentCommandLineTest.java
ndroid/javatests/src/org/chromium/content/browser/ContentViewGestureHandlerTest.java
ndroid/javatests/src/org/chromium/content/browser/ContentViewPopupZoomerTest.java
ndroid/javatests/src/org/chromium/content/browser/ContentViewScrollingTest.java
ndroid/javatests/src/org/chromium/content/browser/DeviceMotionAndOrientationTest.java
ndroid/javatests/src/org/chromium/content/browser/DownloadInfoTest.java
ndroid/javatests/src/org/chromium/content/browser/ImportantFileWriterAndroidTest.java
ndroid/javatests/src/org/chromium/content/browser/JavaBridgeBasicsTest.java
ndroid/javatests/src/org/chromium/content/browser/NavigationTest.java
ndroid/javatests/src/org/chromium/content/browser/OWNERS
ndroid/javatests/src/org/chromium/content/browser/PhoneNumberDetectionTest.java
ndroid/javatests/src/org/chromium/content/browser/TestsJavaScriptEvalTest.java
ndroid/javatests/src/org/chromium/content/browser/input/ImeTest.java
rowser/android/compositor.h
rowser/android/content_view_layer_renderer.h
rowser/browser_child_process_host_iterator.cc
rowser/browser_thread.h
rowser/child_process_security_policy.h
rowser/content_browser_client.cc
rowser/content_browser_client.h
rowser/indexed_db_context.h
rowser/native_web_keyboard_event.h
rowser/navigation_controller.cc
rowser/navigation_controller.h
rowser/navigation_entry.h
rowser/notification_types.h
rowser/page_navigator.cc
rowser/page_navigator.h
rowser/render_process_host.h
rowser/render_process_host_observer.h
rowser/render_view_host.h
rowser/render_widget_host.h
rowser/resource_request_info.h
rowser/session_storage_namespace.h
rowser/signed_certificate_timestamp_store.h
rowser/site_instance.h
rowser/storage_partition.h
rowser/tracing_controller.h
rowser/url_data_source.cc
rowser/url_data_source.h
rowser/utility_process_host.h
rowser/web_contents.h
rowser/web_contents_delegate.cc
rowser/web_contents_delegate.h
rowser/web_contents_observer.h
ommon/common_param_traits_macros.h
ommon/content_switches.cc
ommon/content_switches.h
ommon/context_menu_params.cc
ommon/context_menu_params.h
ommon/drop_data.cc
ommon/drop_data.h
ommon/media_stream_request.cc
ommon/media_stream_request.h
ommon/menu_item.h
ommon/page_state.cc
ommon/referrer.h
ommon/show_desktop_notification_params.cc
ommon/show_desktop_notification_params.h
ommon/window_container_type.cc
ommon/window_container_type.h
enderer/content_renderer_client.cc
enderer/content_renderer_client.h
enderer/document_state.h
enderer/history_item_serialization.cc
enderer/history_item_serialization.h
enderer/navigation_state.cc
enderer/navigation_state.h
enderer/pepper_plugin_instance.h
enderer/render_view.h
enderer/render_view_observer.cc
enderer/render_view_observer.h
enderer/renderer_ppapi_host.h
enderer/resource_fetcher.h
enderer/web_preferences.h
est/OWNERS
est/android/javatests/src/org/chromium/content/browser/test/util/JavaScriptUtils.java
est/android/javatests/src/org/chromium/content/browser/test/util/TestContentViewClientWrapper.java
est/android/javatests/src/org/chromium/content/browser/test/util/TestTouchUtils.java
est/browser_test_utils.cc
est/browser_test_utils.h
est/content_test_suite_base.cc
est/layouttest_support.h
est/mock_render_process_host.cc
est/mock_render_process_host.h
est/mock_render_thread.cc
est/mock_render_thread.h
est/render_view_fake_resources_test.cc
est/render_view_fake_resources_test.h
est/render_view_test.cc
est/render_view_test.h
est/render_widget_test.cc
est/render_widget_test.h
est/test_file_system_backend.cc
est/test_launcher.cc
est/test_navigation_observer.cc
est/test_navigation_observer.h
est/test_renderer_host.cc
est/test_renderer_host.h
est/unittest_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
ndroid/OWNERS
ndroid/java/src/org/chromium/content/browser/ContentVideoView.java
ndroid/java/src/org/chromium/content/browser/ContentViewCore.java
ndroid/java/src/org/chromium/content/browser/ContentViewGestureHandler.java
ndroid/java/src/org/chromium/content/browser/DeviceMotionAndOrientation.java
ndroid/java/src/org/chromium/content/browser/GenericTouchGesture.java
ndroid/java/src/org/chromium/content/browser/RenderCoordinates.java
ndroid/java/src/org/chromium/content/browser/input/ImeAdapter.java
ndroid/javatests/src/org/chromium/content/browser/ContentViewGestureHandlerTest.java
ndroid/javatests/src/org/chromium/content/browser/DeviceMotionAndOrientationTest.java
pp/android_library_loader_hooks.h
rowser/browser_plugin_guest_delegate.cc
rowser/browser_plugin_guest_delegate.h
rowser/child_process_security_policy.h
rowser/content_browser_client.h
rowser/cookie_store_factory.h
ommon/common_param_traits_macros.h
ommon/content_switches.cc
ommon/content_switches.h
ommon/media_stream_request.cc
ommon/media_stream_request.h
enderer/content_renderer_client.cc
enderer/content_renderer_client.h
enderer/history_item_serialization.cc
est/content_test_suite_base.cc
est/test_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
ndroid/java/src/org/chromium/content/browser/ContentView.java
ndroid/java/src/org/chromium/content/browser/ContentViewCore.java
ndroid/java/src/org/chromium/content/browser/ContentViewGestureHandler.java
ndroid/java/src/org/chromium/content/browser/GenericTouchGesture.java
ndroid/java/src/org/chromium/content/browser/LocationProvider.java
ndroid/java/src/org/chromium/content/browser/PageInfo.java
ndroid/java/src/org/chromium/content/common/CleanupReference.java
ndroid/java/src/org/chromium/content/common/CommandLine.java
ndroid/java/src/org/chromium/content/common/TraceEvent.java
ndroid/java/strings/translations/android_content_strings_am.xtb
ndroid/java/strings/translations/android_content_strings_ar.xtb
ndroid/java/strings/translations/android_content_strings_bg.xtb
ndroid/java/strings/translations/android_content_strings_ca.xtb
ndroid/java/strings/translations/android_content_strings_cs.xtb
ndroid/java/strings/translations/android_content_strings_da.xtb
ndroid/java/strings/translations/android_content_strings_de.xtb
ndroid/java/strings/translations/android_content_strings_el.xtb
ndroid/java/strings/translations/android_content_strings_en-GB.xtb
ndroid/java/strings/translations/android_content_strings_es-419.xtb
ndroid/java/strings/translations/android_content_strings_es.xtb
ndroid/java/strings/translations/android_content_strings_fa.xtb
ndroid/java/strings/translations/android_content_strings_fi.xtb
ndroid/java/strings/translations/android_content_strings_fil.xtb
ndroid/java/strings/translations/android_content_strings_fr.xtb
ndroid/java/strings/translations/android_content_strings_hi.xtb
ndroid/java/strings/translations/android_content_strings_hr.xtb
ndroid/java/strings/translations/android_content_strings_hu.xtb
ndroid/java/strings/translations/android_content_strings_id.xtb
ndroid/java/strings/translations/android_content_strings_it.xtb
ndroid/java/strings/translations/android_content_strings_iw.xtb
ndroid/java/strings/translations/android_content_strings_ja.xtb
ndroid/java/strings/translations/android_content_strings_ko.xtb
ndroid/java/strings/translations/android_content_strings_lt.xtb
ndroid/java/strings/translations/android_content_strings_lv.xtb
ndroid/java/strings/translations/android_content_strings_nl.xtb
ndroid/java/strings/translations/android_content_strings_no.xtb
ndroid/java/strings/translations/android_content_strings_pl.xtb
ndroid/java/strings/translations/android_content_strings_pt-BR.xtb
ndroid/java/strings/translations/android_content_strings_pt-PT.xtb
ndroid/java/strings/translations/android_content_strings_ro.xtb
ndroid/java/strings/translations/android_content_strings_ru.xtb
ndroid/java/strings/translations/android_content_strings_sk.xtb
ndroid/java/strings/translations/android_content_strings_sl.xtb
ndroid/java/strings/translations/android_content_strings_sr.xtb
ndroid/java/strings/translations/android_content_strings_sv.xtb
ndroid/java/strings/translations/android_content_strings_sw.xtb
ndroid/java/strings/translations/android_content_strings_th.xtb
ndroid/java/strings/translations/android_content_strings_tr.xtb
ndroid/java/strings/translations/android_content_strings_uk.xtb
ndroid/java/strings/translations/android_content_strings_vi.xtb
ndroid/java/strings/translations/android_content_strings_zh-CN.xtb
ndroid/java/strings/translations/android_content_strings_zh-TW.xtb
ndroid/javatests/src/org/chromium/content/browser/ClipboardTest.java
ndroid/javatests/src/org/chromium/content/browser/ContentViewGestureHandlerTest.java
ndroid/javatests/src/org/chromium/content/browser/ContentViewScrollingTest.java
rowser/browser_context.h
rowser/devtools_http_handler_delegate.h
rowser/media_device_id.cc
rowser/media_device_id.h
rowser/navigation_controller.cc
rowser/navigation_controller.h
rowser/notification_types.h
rowser/page_navigator.h
rowser/render_view_host.h
rowser/render_view_host_observer.cc
rowser/render_view_host_observer.h
rowser/resource_context.h
rowser/web_contents_observer.cc
rowser/zygote_host_linux.h
ommon/common_param_traits.cc
ommon/common_param_traits_macros.h
ommon/content_constants.cc
ommon/content_constants.h
ommon/content_switches.cc
ommon/content_switches.h
ommon/media_stream_request.h
enderer/history_item_serialization.cc
est/android/OWNERS
est/browser_test_base.cc
est/browser_test_base.h
est/js_injection_ready_observer.h
est/layouttest_support.h
est/render_view_test.cc
est/test_browser_context.cc
est/test_browser_context.h
est/test_launcher.cc
est/test_launcher.h
est/test_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
ndroid/java/res/drawable-hdpi/ondemand_overlay.9.png
ndroid/java/res/drawable-xhdpi/ondemand_overlay.9.png
ndroid/java/res/drawable/ondemand_overlay.9.png
ndroid/java/src/org/chromium/content/app/ChildProcessService.java
ndroid/java/src/org/chromium/content/app/LibraryLoader.java
ndroid/java/src/org/chromium/content/app/Linker.java
ndroid/java/src/org/chromium/content/app/LinkerParams.java
ndroid/java/src/org/chromium/content/browser/ChildProcessConnection.java
ndroid/java/src/org/chromium/content/browser/ChildProcessLauncher.java
ndroid/java/src/org/chromium/content/browser/ContentView.java
ndroid/java/src/org/chromium/content/browser/ContentViewCore.java
ndroid/java/src/org/chromium/content/browser/ContentViewRenderView.java
ndroid/java/src/org/chromium/content/browser/TracingControllerAndroid.java
ndroid/java/src/org/chromium/content/browser/VibrationMessageFilter.java
ndroid/java/src/org/chromium/content/common/CommandLine.java
ndroid/java/strings/translations/android_content_strings_am.xtb
ndroid/java/strings/translations/android_content_strings_ar.xtb
ndroid/java/strings/translations/android_content_strings_bg.xtb
ndroid/java/strings/translations/android_content_strings_ca.xtb
ndroid/java/strings/translations/android_content_strings_cs.xtb
ndroid/java/strings/translations/android_content_strings_da.xtb
ndroid/java/strings/translations/android_content_strings_de.xtb
ndroid/java/strings/translations/android_content_strings_el.xtb
ndroid/java/strings/translations/android_content_strings_en-GB.xtb
ndroid/java/strings/translations/android_content_strings_es-419.xtb
ndroid/java/strings/translations/android_content_strings_es.xtb
ndroid/java/strings/translations/android_content_strings_fa.xtb
ndroid/java/strings/translations/android_content_strings_fi.xtb
ndroid/java/strings/translations/android_content_strings_fil.xtb
ndroid/java/strings/translations/android_content_strings_fr.xtb
ndroid/java/strings/translations/android_content_strings_hi.xtb
ndroid/java/strings/translations/android_content_strings_hr.xtb
ndroid/java/strings/translations/android_content_strings_hu.xtb
ndroid/java/strings/translations/android_content_strings_id.xtb
ndroid/java/strings/translations/android_content_strings_it.xtb
ndroid/java/strings/translations/android_content_strings_iw.xtb
ndroid/java/strings/translations/android_content_strings_ja.xtb
ndroid/java/strings/translations/android_content_strings_ko.xtb
ndroid/java/strings/translations/android_content_strings_lt.xtb
ndroid/java/strings/translations/android_content_strings_lv.xtb
ndroid/java/strings/translations/android_content_strings_nl.xtb
ndroid/java/strings/translations/android_content_strings_no.xtb
ndroid/java/strings/translations/android_content_strings_pl.xtb
ndroid/java/strings/translations/android_content_strings_pt-BR.xtb
ndroid/java/strings/translations/android_content_strings_pt-PT.xtb
ndroid/java/strings/translations/android_content_strings_ro.xtb
ndroid/java/strings/translations/android_content_strings_ru.xtb
ndroid/java/strings/translations/android_content_strings_sk.xtb
ndroid/java/strings/translations/android_content_strings_sl.xtb
ndroid/java/strings/translations/android_content_strings_sr.xtb
ndroid/java/strings/translations/android_content_strings_sv.xtb
ndroid/java/strings/translations/android_content_strings_sw.xtb
ndroid/java/strings/translations/android_content_strings_th.xtb
ndroid/java/strings/translations/android_content_strings_tr.xtb
ndroid/java/strings/translations/android_content_strings_uk.xtb
ndroid/java/strings/translations/android_content_strings_vi.xtb
ndroid/java/strings/translations/android_content_strings_zh-CN.xtb
ndroid/java/strings/translations/android_content_strings_zh-TW.xtb
ndroid/java/templates/NativeLibraries.template
rowser/child_process_security_policy.h
rowser/download_manager.h
rowser/render_view_host_observer.cc
rowser/render_view_host_observer.h
rowser/web_contents_delegate.h
rowser/web_contents_observer.h
ommon/common_param_traits_macros.h
ommon/content_switches.cc
ommon/content_switches.h
enderer/render_thread.h
est/browser_test_utils.cc
est/browser_test_utils.h
est/download_test_observer.cc
est/download_test_observer.h
est/mock_download_manager.h
est/mock_render_thread.cc
est/mock_render_thread.h
est/test_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/java/res/menu/select_action_menu.xml
ndroid/java/res/values-v17/styles.xml
ndroid/java/res/values/attrs.xml
ndroid/java/resource_map/org/chromium/content/R.java
ndroid/java/src/org/chromium/content/app/ContentApplication.java
ndroid/java/src/org/chromium/content/browser/ChildProcessConnection.java
ndroid/java/src/org/chromium/content/browser/ChildProcessLauncher.java
ndroid/java/src/org/chromium/content/browser/ContentVideoView.java
ndroid/java/src/org/chromium/content/browser/ContentView.java
ndroid/java/src/org/chromium/content/browser/ContentViewClient.java
ndroid/java/src/org/chromium/content/browser/ContentViewCore.java
ndroid/java/src/org/chromium/content/browser/ContentViewGestureHandler.java
ndroid/java/src/org/chromium/content/browser/ContentViewRenderView.java
ndroid/java/src/org/chromium/content/browser/LocationProvider.java
ndroid/java/src/org/chromium/content/browser/LongPressDetector.java
ndroid/java/src/org/chromium/content/browser/PepperPluginManager.java
ndroid/java/src/org/chromium/content/browser/PositionObserver.java
ndroid/java/src/org/chromium/content/browser/SelectActionModeCallback.java
ndroid/java/src/org/chromium/content/browser/TracingControllerAndroid.java
ndroid/java/src/org/chromium/content/browser/TracingIntentHandler.java
ndroid/java/src/org/chromium/content/browser/ViewPositionObserver.java
ndroid/java/src/org/chromium/content/browser/WebContentsObserverAndroid.java
ndroid/java/src/org/chromium/content/browser/ZoomManager.java
ndroid/java/src/org/chromium/content/browser/input/AdapterInputConnection.java
ndroid/java/src/org/chromium/content/browser/input/HandleView.java
ndroid/java/src/org/chromium/content/browser/input/ImeAdapter.java
ndroid/java/src/org/chromium/content/browser/input/InsertionHandleController.java
ndroid/java/src/org/chromium/content/browser/input/SelectionHandleController.java
ndroid/java/strings/android_content_strings.grd
ndroid/javatests/src/org/chromium/content/browser/ContentViewGestureHandlerTest.java
ndroid/javatests/src/org/chromium/content/browser/LocationProviderTest.java
ndroid/javatests/src/org/chromium/content/browser/TracingControllerAndroidTest.java
ndroid/javatests/src/org/chromium/content/browser/input/AdapterInputConnectionTest.java
ndroid/javatests/src/org/chromium/content/browser/input/ImeTest.java
ndroid/javatests/src/org/chromium/content/browser/input/SelectionHandleTest.java
rowser/android/compositor.h
rowser/android/synchronous_compositor.cc
rowser/android/synchronous_compositor.h
rowser/android/synchronous_compositor_client.h
rowser/browser_message_filter.cc
rowser/browser_message_filter.h
rowser/browser_plugin_guest_delegate.cc
rowser/browser_plugin_guest_delegate.h
rowser/child_process_security_policy.h
rowser/content_browser_client.cc
rowser/content_browser_client.h
rowser/devtools_http_handler.h
rowser/devtools_http_handler_delegate.h
rowser/devtools_target.h
rowser/host_zoom_map.h
rowser/navigation_controller.h
rowser/navigation_entry.h
rowser/notification_types.h
rowser/page_navigator.h
rowser/render_process_host.h
rowser/render_view_host.h
rowser/resource_request_info.h
rowser/session_storage_namespace.h
rowser/speech_recognition_manager.h
rowser/speech_recognition_session_context.cc
rowser/speech_recognition_session_context.h
rowser/trace_subscriber.h
rowser/tracing_controller.h
rowser/web_contents_observer.h
ommon/browser_plugin_permission_type.h
ommon/common_param_traits_macros.h
ommon/content_descriptors.h
ommon/content_switches.cc
ommon/content_switches.h
ommon/url_constants.cc
ommon/url_constants.h
ommon/zygote_fork_delegate_linux.h
enderer/content_renderer_client.cc
enderer/content_renderer_client.h
enderer/history_item_serialization.cc
enderer/render_view.h
enderer/render_view_observer.h
enderer/webrtc_log_message_delegate.h
est/android/javatests/src/org/chromium/content/browser/test/util/TestContentViewClientWrapper.java
est/browser_test_base.cc
est/browser_test_utils.cc
est/browser_test_utils.h
est/content_test_suite_base.cc
est/mock_render_process_host.cc
est/mock_render_process_host.h
est/mock_render_thread.cc
est/mock_render_thread.h
est/sandbox_file_system_test_helper.cc
est/sandbox_file_system_test_helper.h
est/test_file_system_backend.cc
est/test_file_system_backend.h
est/test_file_system_context.cc
est/test_file_system_context.h
est/test_file_system_options.cc
est/test_file_system_options.h
est/test_launcher.cc
est/test_navigation_observer.cc
est/test_navigation_observer.h
est/test_utils.cc
est/test_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/java/src/org/chromium/content/browser/ContentViewCore.java
ndroid/java/src/org/chromium/content/browser/ContentViewGestureHandler.java
ndroid/java/src/org/chromium/content/browser/ContentViewRenderView.java
ndroid/java/src/org/chromium/content/browser/MediaDrmCredentialManager.java
ndroid/java/src/org/chromium/content/browser/input/AdapterInputConnection.java
ndroid/javatests/src/org/chromium/content/browser/ContentViewGestureHandlerTest.java
ndroid/javatests/src/org/chromium/content/browser/input/AdapterInputConnectionTest.java
ndroid/javatests/src/org/chromium/content/browser/input/ImeTest.java
rowser/android/compositor.h
rowser/android/compositor_client.h
rowser/android/content_view_core.h
rowser/android/synchronous_compositor_client.h
rowser/browser_plugin_guest_delegate.cc
rowser/browser_plugin_guest_delegate.h
rowser/child_process_security_policy.h
rowser/content_browser_client.cc
rowser/content_browser_client.h
rowser/gpu_data_manager.h
rowser/navigation_controller.h
rowser/resource_dispatcher_host_delegate.cc
rowser/resource_dispatcher_host_delegate.h
rowser/web_contents_delegate.h
ommon/common_param_traits_macros.h
ommon/content_switches.cc
ommon/content_switches.h
ommon/media_stream_request.cc
ommon/media_stream_request.h
ommon/renderer_preferences.cc
ommon/renderer_preferences.h
enderer/content_renderer_client.h
enderer/history_item_serialization.cc
enderer/pepper_plugin_instance.h
est/android/javatests/src/org/chromium/content/browser/test/util/TestInputMethodManagerWrapper.java
est/browser_test_base.cc
est/browser_test_base.h
est/browser_test_utils.cc
est/test_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
ndroid/java/src/org/chromium/content/browser/ChildProcessConnection.java
ndroid/java/src/org/chromium/content/browser/ChildProcessLauncher.java
ndroid/java/src/org/chromium/content/browser/ContentView.java
ndroid/java/src/org/chromium/content/browser/ContentViewCore.java
ndroid/java/src/org/chromium/content/browser/ContentViewGestureHandler.java
ndroid/java/src/org/chromium/content/browser/GenericTouchGesture.java
ndroid/java/src/org/chromium/content/browser/LoadUrlParams.java
ndroid/java/src/org/chromium/content/browser/LocationProvider.java
ndroid/java/src/org/chromium/content/browser/WebContentsObserverAndroid.java
ndroid/java/src/org/chromium/content/browser/input/AdapterInputConnection.java
ndroid/java/src/org/chromium/content/browser/input/SelectPopupDialog.java
ndroid/javatests/src/org/chromium/content/browser/ContentViewGestureHandlerTest.java
ndroid/javatests/src/org/chromium/content/browser/InterstitialPageTest.java
ndroid/javatests/src/org/chromium/content/browser/LocationProviderTest.java
ndroid/javatests/src/org/chromium/content/browser/input/SelectionHandleTest.java
rowser/android/compositor.h
rowser/android/compositor_client.h
rowser/browser_plugin_guest_delegate.cc
rowser/browser_plugin_guest_delegate.h
rowser/cookie_store_factory.h
rowser/javascript_dialog_manager.h
rowser/native_web_keyboard_event.h
rowser/navigation_controller.h
rowser/render_view_host.h
rowser/web_contents.h
rowser/web_contents_delegate.cc
rowser/web_contents_delegate.h
ommon/common_param_traits_macros.h
ommon/content_switches.cc
ommon/content_switches.h
ommon/renderer_preferences.cc
ommon/renderer_preferences.h
ommon/socket_permission_request.h
ommon/url_constants.cc
ommon/url_constants.h
enderer/content_renderer_client.cc
enderer/content_renderer_client.h
enderer/key_system_info.cc
enderer/key_system_info.h
enderer/pepper_plugin_instance.h
enderer/render_view_observer.h
enderer/renderer_ppapi_host.h
est/browser_test_utils.h
est/render_view_test.cc
est/test_launcher.cc
est/test_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
ndroid/java/res/layout/multi_field_time_picker_dialog.xml
ndroid/java/res/layout/two_field_date_picker.xml
ndroid/java/res/mipmap-hdpi/app_icon.png
ndroid/java/res/mipmap-mdpi/app_icon.png
ndroid/java/res/mipmap-xhdpi/app_icon.png
ndroid/java/res/mipmap-xxhdpi/app_icon.png
ndroid/java/res/values-v17/styles.xml
ndroid/java/res/values/attrs.xml
ndroid/java/resource_map/org/chromium/content/R.java
ndroid/java/src/org/chromium/content/browser/AndroidBrowserProcess.java
ndroid/java/src/org/chromium/content/browser/ContentViewClient.java
ndroid/java/src/org/chromium/content/browser/ContentViewCore.java
ndroid/java/src/org/chromium/content/browser/ContentViewGestureHandler.java
ndroid/java/src/org/chromium/content/browser/SelectActionModeCallback.java
ndroid/java/src/org/chromium/content/browser/accessibility/BrowserAccessibilityManager.java
ndroid/java/src/org/chromium/content/browser/input/AdapterInputConnection.java
ndroid/java/src/org/chromium/content/browser/input/HandleView.java
ndroid/java/src/org/chromium/content/browser/input/InputDialogContainer.java
ndroid/java/src/org/chromium/content/browser/input/MonthPicker.java
ndroid/java/src/org/chromium/content/browser/input/SelectPopupDialog.java
ndroid/java/src/org/chromium/content/browser/input/TwoFieldDatePicker.java
ndroid/java/src/org/chromium/content/browser/input/WeekPicker.java
ndroid/javatests/src/org/chromium/content/browser/ContentViewGestureHandlerTest.java
ndroid/javatests/src/org/chromium/content/browser/input/SelectionHandleTest.java
rowser/android/compositor.h
rowser/android/compositor_client.h
rowser/android/synchronous_compositor.cc
rowser/android/synchronous_compositor.h
rowser/android/synchronous_compositor_client.h
rowser/browser_child_process_host.h
rowser/browser_plugin_guest_delegate.h
rowser/content_browser_client.cc
rowser/content_browser_client.h
rowser/devtools_frontend_host_delegate.h
rowser/devtools_http_handler_delegate.h
rowser/notification_types.h
rowser/render_widget_host.h
rowser/render_widget_host_iterator.h
rowser/render_widget_host_view.h
rowser/trace_controller.h
rowser/tracing_controller.h
rowser/utility_process_host.h
rowser/web_contents_delegate.cc
rowser/web_contents_delegate.h
rowser/web_contents_observer.h
ommon/common_param_traits_macros.h
ommon/content_switches.cc
ommon/content_switches.h
ommon/media_stream_request.cc
ommon/media_stream_request.h
ommon/password_form.cc
ommon/password_form.h
enderer/content_renderer_client.cc
enderer/content_renderer_client.h
enderer/history_item_serialization.cc
enderer/password_form_conversion_utils.h
enderer/render_view_observer.h
est/browser_test_base.cc
est/browser_test_base.h
est/browser_test_utils.cc
est/browser_test_utils.h
est/content_test_suite_base.cc
est/mock_render_process_host.cc
est/nested_message_pump_android.cc
est/render_view_fake_resources_test.cc
est/render_view_test.cc
est/test_browser_thread.h
est/test_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
ndroid/java/src/org/chromium/content/browser/AndroidBrowserProcess.java
ndroid/java/src/org/chromium/content/browser/BrowserStartupController.java
ndroid/java/src/org/chromium/content/browser/ContentViewCore.java
ndroid/java/src/org/chromium/content/browser/ContentViewGestureHandler.java
ndroid/java/src/org/chromium/content/browser/GenericTouchGesture.java
ndroid/java/src/org/chromium/content/browser/SelectActionModeCallback.java
ndroid/java/src/org/chromium/content/browser/SmoothScroller.java
ndroid/java/src/org/chromium/content/browser/VSyncMonitor.java
ndroid/java/src/org/chromium/content/browser/input/AdapterInputConnection.java
ndroid/java/strings/android_content_strings.grd
ndroid/javatests/src/org/chromium/content/browser/AddressDetectionTest.java
ndroid/javatests/src/org/chromium/content/browser/BrowserStartupControllerTest.java
ndroid/javatests/src/org/chromium/content/browser/VSyncMonitorTest.java
ndroid/javatests/src/org/chromium/content/browser/input/ImeTest.java
ndroid/javatests/src/org/chromium/content/browser/input/SelectPopupTest.java
rowser/browser_child_process_host.h
rowser/browser_plugin_guest_delegate.h
rowser/browser_ppapi_host.h
rowser/devtools_agent_host.h
rowser/javascript_dialog_manager.h
rowser/keyboard_listener.h
rowser/navigation_entry.h
rowser/overscroll_configuration.h
rowser/render_frame_host.h
rowser/render_widget_host.h
rowser/web_contents.h
rowser/web_contents_delegate.cc
rowser/web_contents_delegate.h
rowser/web_ui_data_source.h
ommon/content_switches.cc
ommon/content_switches.h
ommon/context_menu_params.cc
ommon/context_menu_params.h
ommon/renderer_preferences.h
ommon/url_constants.cc
ommon/url_constants.h
enderer/content_renderer_client.h
enderer/renderer_ppapi_host.h
est/browser_test_base.cc
est/content_test_suite_base.cc
est/test_file_error_injector.h
est/test_launcher.cc
tility/utility_thread.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
ndroid/java/res/layout/multi_field_time_picker_dialog.xml
ndroid/java/resource_map/org/chromium/content/R.java
ndroid/java/src/org/chromium/content/app/LibraryLoader.java
ndroid/java/src/org/chromium/content/browser/AndroidBrowserProcess.java
ndroid/java/src/org/chromium/content/browser/BrowserStartupConfig.java
ndroid/java/src/org/chromium/content/browser/BrowserStartupController.java
ndroid/java/src/org/chromium/content/browser/ChildProcessConnection.java
ndroid/java/src/org/chromium/content/browser/ContentView.java
ndroid/java/src/org/chromium/content/browser/ContentViewCore.java
ndroid/java/src/org/chromium/content/browser/ContentViewGestureHandler.java
ndroid/java/src/org/chromium/content/browser/DeviceMotionAndOrientation.java
ndroid/java/src/org/chromium/content/browser/MediaResourceGetter.java
ndroid/java/src/org/chromium/content/browser/input/DateTimeChooserAndroid.java
ndroid/java/src/org/chromium/content/browser/input/InputDialogContainer.java
ndroid/java/src/org/chromium/content/browser/input/MultiFieldTimePickerDialog.java
ndroid/java/src/org/chromium/content/browser/input/TimeDialog.java
ndroid/java/strings/android_content_strings.grd
ndroid/javatests/src/org/chromium/content/browser/BrowserStartupControllerTest.java
ndroid/javatests/src/org/chromium/content/browser/ContentViewGestureHandlerTest.java
ndroid/javatests/src/org/chromium/content/browser/ContentViewScrollingTest.java
ndroid/javatests/src/org/chromium/content/browser/DeviceMotionAndOrientationTest.java
ndroid/javatests/src/org/chromium/content/browser/input/ImeTest.java
ndroid/javatests/src/org/chromium/content/browser/input/InsertionHandleTest.java
ndroid/javatests/src/org/chromium/content/common/CleanupReferenceTest.java
rowser/browser_plugin_guest_delegate.h
rowser/browser_url_handler.h
rowser/compositor_util.h
rowser/render_process_host.h
rowser/utility_process_host.h
rowser/web_contents.cc
rowser/web_contents.h
rowser/web_contents_delegate.cc
rowser/web_contents_delegate.h
rowser/web_contents_observer.h
rowser/web_ui_data_source.h
ommon/content_switches.cc
ommon/content_switches.h
ommon/frame_navigate_params.h
ommon/url_constants.cc
ommon/url_constants.h
ommon/zygote_fork_delegate_linux.h
enderer/content_renderer_client.cc
enderer/content_renderer_client.h
enderer/document_state.cc
enderer/document_state.h
enderer/render_view_observer.h
enderer/renderer_ppapi_host.h
enderer/web_preferences.h
est/browser_test_base.cc
est/browser_test_utils.cc
est/browser_test_utils.h
est/content_test_suite_base.cc
est/layouttest_support.h
est/render_view_test.cc
est/test_browser_thread.h
est/test_browser_thread_bundle.cc
est/test_browser_thread_bundle.h
est/test_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
ndroid/java/src/org/chromium/content/browser/ContentView.java
ndroid/java/src/org/chromium/content/browser/ContentViewCore.java
ndroid/java/src/org/chromium/content/browser/input/ImeAdapter.java
ndroid/java/src/org/chromium/content/browser/input/InsertionHandleController.java
ndroid/java/src/org/chromium/content/browser/input/SelectionHandleController.java
ndroid/javatests/src/org/chromium/content/browser/ContentDetectionTestBase.java
ndroid/javatests/src/org/chromium/content/browser/input/InsertionHandleTest.java
ndroid/javatests/src/org/chromium/content/browser/input/SelectionHandleTest.java
rowser/browser_plugin_guest_delegate.cc
rowser/browser_plugin_guest_delegate.h
ommon/browser_plugin_permission_type.h
ommon/content_switches.cc
ommon/content_switches.h
enderer/pepper_plugin_instance.h
enderer/renderer_ppapi_host.h
enderer/v8_value_converter.h
est/browser_test_base.cc
est/browser_test_base.h
est/content_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
ndroid/java/src/org/chromium/content/browser/ChildProcessLauncher.java
ndroid/java/src/org/chromium/content/browser/ContentView.java
ndroid/java/src/org/chromium/content/browser/ContentViewCore.java
ndroid/java/src/org/chromium/content/browser/PowerSaveBlocker.java
ndroid/java/src/org/chromium/content/browser/ResourceExtractor.java
rowser/browser_thread.h
rowser/download_manager.h
rowser/download_manager_delegate.cc
rowser/download_manager_delegate.h
rowser/storage_partition.h
rowser/web_contents.h
ommon/content_constants.cc
ommon/content_constants.h
ommon/content_switches.cc
ommon/content_switches.h
ommon/desktop_media_id.cc
ommon/desktop_media_id.h
ommon/media_stream_request.cc
ommon/media_stream_request.h
ommon/url_constants.cc
ommon/url_constants.h
enderer/content_renderer_client.cc
enderer/content_renderer_client.h
enderer/pepper_plugin_instance.h
enderer/renderer_ppapi_host.h
est/mock_download_manager.cc
est/mock_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
ndroid/java/src/org/chromium/content/browser/ContentView.java
ndroid/java/src/org/chromium/content/browser/ContentViewGestureHandler.java
ndroid/javatests/src/org/chromium/content/browser/ContentViewGestureHandlerTest.java
rowser/android/synchronous_compositor.h
rowser/dom_storage_context.h
rowser/local_storage_usage_info.cc
rowser/local_storage_usage_info.h
rowser/session_storage_usage_info.h
ommon/content_switches.cc
ommon/content_switches.h
est/render_view_fake_resources_test.cc
est/render_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
ndroid/java/src/org/chromium/content/common/CommandLine.java
rowser/resource_context.h
ommon/content_switches.cc
ommon/content_switches.h
est/mock_resource_context.cc
est/mock_resource_context.h
2385ea399aae016c0806a4f9ef3c9cfe3d2a39df 06-Aug-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r215849

This commit was generated by merge_to_master.py.

Change-Id: I225a31651af894e33bdd71e7121702bcbe5310f4
ndroid/java/src/org/chromium/content/common/TraceEvent.java
rowser/content_browser_client.h
rowser/devtools_frontend_host_delegate.h
ommon/renderer_preferences.cc
ommon/renderer_preferences.h
enderer/pepper_plugin_instance.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/java/src/org/chromium/content/browser/BrowserStartupConfig.java
ndroid/java/src/org/chromium/content/browser/ContentVideoView.java
ndroid/java/src/org/chromium/content/browser/ContentViewClient.java
ndroid/java/src/org/chromium/content/browser/ContentViewCore.java
ndroid/java/src/org/chromium/content/browser/DeviceUtils.java
ndroid/java/src/org/chromium/content/browser/LongPressDetector.java
ndroid/java/src/org/chromium/content/browser/SpeechRecognition.java
ndroid/java/src/org/chromium/content/browser/input/AdapterInputConnection.java
ndroid/java/src/org/chromium/content/browser/input/ImeAdapter.java
ndroid/java/src/org/chromium/content/browser/input/TimeDialog.java
ndroid/java/src/org/chromium/content/common/CommandLine.java
ndroid/javatests/src/org/chromium/content/browser/input/InsertionHandleTest.java
rowser/content_browser_client.cc
rowser/content_browser_client.h
rowser/javascript_dialog_manager.h
rowser/page_navigator.cc
rowser/page_navigator.h
rowser/storage_partition.h
rowser/web_contents.cc
rowser/web_contents.h
ommon/content_switches.cc
ommon/content_switches.h
ommon/file_chooser_params.h
ommon/media_stream_request.cc
ommon/media_stream_request.h
ommon/url_constants.cc
ommon/url_constants.h
enderer/content_renderer_client.cc
enderer/content_renderer_client.h
enderer/pepper_plugin_instance.h
enderer/render_view_observer.h
est/android/javatests/src/org/chromium/content/browser/test/util/TestContentViewClientWrapper.java
est/browser_test_base.cc
fb250657ef40d7500f20882d5c9909c1013367d3 31-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r214456

This commit was generated by merge_to_master.py.

Change-Id: If3f38c7966c2034e96c669968f72ea1e57f41964
rowser/android/synchronous_compositor.h
ommon/renderer_preferences.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/java/src/org/chromium/content/browser/ChildProcessConnection.java
ndroid/java/src/org/chromium/content/browser/ChildProcessLauncher.java
ndroid/java/src/org/chromium/content/browser/ContentViewClient.java
ndroid/java/src/org/chromium/content/browser/ContentViewCore.java
est/android/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
ndroid/java/src/org/chromium/content/browser/ContentViewClient.java
ndroid/java/src/org/chromium/content/browser/ContentViewCore.java
ndroid/java/src/org/chromium/content/common/CommandLine.java
rowser/android/content_view_core.h
rowser/content_browser_client.cc
rowser/content_browser_client.h
rowser/download_danger_type.h
rowser/download_item.h
rowser/resource_dispatcher_host_delegate.cc
rowser/resource_dispatcher_host_delegate.h
ommon/content_switches.cc
ommon/content_switches.h
enderer/document_state.cc
enderer/document_state.h
enderer/render_view_observer.h
enderer/renderer_restrict_dispatch_group.h
est/mock_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
ndroid/java/src/org/chromium/content/browser/ChildProcessLauncher.java
rowser/browser_child_process_host.h
rowser/browser_message_filter.cc
rowser/browser_message_filter.h
rowser/browser_plugin_guest_delegate.h
rowser/browser_ppapi_host.h
rowser/child_process_data.h
rowser/gpu_data_manager.h
rowser/gpu_data_manager_observer.h
rowser/overscroll_configuration.h
rowser/render_process_host.h
rowser/storage_partition.h
rowser/utility_process_host.h
rowser/web_contents.h
rowser/web_contents_observer.h
rowser/web_contents_view.h
rowser/worker_service.h
rowser/worker_service_observer.h
rowser/zygote_host_linux.h
ommon/common_param_traits_macros.h
ommon/gpu_memory_stats.h
ommon/page_zoom.h
ommon/sandbox_init.h
ommon/sandboxed_process_launcher_delegate.h
enderer/content_renderer_client.cc
enderer/content_renderer_client.h
enderer/pepper_plugin_instance.h
enderer/ppapi_plugin_instance.h
enderer/renderer_ppapi_host.h
est/browser_test_base.cc
est/browser_test_utils.cc
est/browser_test_utils.h
est/mock_render_thread.cc
est/render_view_fake_resources_test.cc
est/test_launcher.cc
bbcdd45c55eb7c4641ab97aef9889b0fc828e7d3 25-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r213605

This commit was generated by merge_to_master.py.

Change-Id: I5ef9e03bf077dac295a7904f06b3cb6dec9fe213
ndroid/java/src/org/chromium/content/browser/ChildProcessConnection.java
ndroid/java/src/org/chromium/content/browser/ChildProcessLauncher.java
ndroid/java/src/org/chromium/content/browser/ContentViewCore.java
ndroid/java/src/org/chromium/content/browser/SelectActionModeCallback.java
rowser/storage_partition.h
rowser/web_contents_delegate.h
ommon/content_switches.cc
ommon/content_switches.h
ommon/pepper_plugin_info.cc
ommon/pepper_plugin_info.h
enderer/ppapi_plugin_instance.h
enderer/renderer_ppapi_host.h
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
ndroid/java/src/org/chromium/content/browser/ContentViewCore.java
rowser/child_process_security_policy.h
rowser/download_danger_type.h
rowser/navigation_controller.h
rowser/web_contents_delegate.cc
rowser/web_contents_delegate.h
ommon/content_client.cc
ommon/content_client.h
enderer/content_renderer_client.cc
enderer/content_renderer_client.h
enderer/renderer_ppapi_host.h
est/mock_resource_context.cc
est/mock_resource_context.h
est/test_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
ndroid/java/src/org/chromium/content/browser/ActivityContentVideoViewClient.java
ndroid/java/src/org/chromium/content/browser/ContentVideoView.java
ndroid/java/src/org/chromium/content/browser/ContentVideoViewClient.java
ndroid/java/src/org/chromium/content/browser/PepperPluginManager.java
ndroid/java/src/org/chromium/content/browser/PowerSaveBlocker.java
ndroid/java/src/org/chromium/content/browser/VibrationMessageFilter.java
ndroid/java/src/org/chromium/content/browser/input/TwoFieldDatePicker.java
ndroid/java/strings/translations/android_content_strings_am.xtb
ndroid/java/strings/translations/android_content_strings_ar.xtb
ndroid/java/strings/translations/android_content_strings_bg.xtb
ndroid/java/strings/translations/android_content_strings_ca.xtb
ndroid/java/strings/translations/android_content_strings_cs.xtb
ndroid/java/strings/translations/android_content_strings_da.xtb
ndroid/java/strings/translations/android_content_strings_de.xtb
ndroid/java/strings/translations/android_content_strings_el.xtb
ndroid/java/strings/translations/android_content_strings_en-GB.xtb
ndroid/java/strings/translations/android_content_strings_es-419.xtb
ndroid/java/strings/translations/android_content_strings_es.xtb
ndroid/java/strings/translations/android_content_strings_fa.xtb
ndroid/java/strings/translations/android_content_strings_fi.xtb
ndroid/java/strings/translations/android_content_strings_fil.xtb
ndroid/java/strings/translations/android_content_strings_fr.xtb
ndroid/java/strings/translations/android_content_strings_hi.xtb
ndroid/java/strings/translations/android_content_strings_hr.xtb
ndroid/java/strings/translations/android_content_strings_hu.xtb
ndroid/java/strings/translations/android_content_strings_id.xtb
ndroid/java/strings/translations/android_content_strings_it.xtb
ndroid/java/strings/translations/android_content_strings_iw.xtb
ndroid/java/strings/translations/android_content_strings_ja.xtb
ndroid/java/strings/translations/android_content_strings_ko.xtb
ndroid/java/strings/translations/android_content_strings_lt.xtb
ndroid/java/strings/translations/android_content_strings_lv.xtb
ndroid/java/strings/translations/android_content_strings_nl.xtb
ndroid/java/strings/translations/android_content_strings_no.xtb
ndroid/java/strings/translations/android_content_strings_pl.xtb
ndroid/java/strings/translations/android_content_strings_pt-BR.xtb
ndroid/java/strings/translations/android_content_strings_pt-PT.xtb
ndroid/java/strings/translations/android_content_strings_ro.xtb
ndroid/java/strings/translations/android_content_strings_ru.xtb
ndroid/java/strings/translations/android_content_strings_sk.xtb
ndroid/java/strings/translations/android_content_strings_sl.xtb
ndroid/java/strings/translations/android_content_strings_sr.xtb
ndroid/java/strings/translations/android_content_strings_sv.xtb
ndroid/java/strings/translations/android_content_strings_sw.xtb
ndroid/java/strings/translations/android_content_strings_th.xtb
ndroid/java/strings/translations/android_content_strings_tr.xtb
ndroid/java/strings/translations/android_content_strings_uk.xtb
ndroid/java/strings/translations/android_content_strings_vi.xtb
ndroid/java/strings/translations/android_content_strings_zh-CN.xtb
ndroid/java/strings/translations/android_content_strings_zh-TW.xtb
pp/content_main_delegate.cc
rowser/android/synchronous_compositor_client.h
rowser/browser_thread.h
rowser/content_browser_client.h
rowser/indexed_db_info.cc
rowser/indexed_db_info.h
rowser/load_from_memory_cache_details.h
rowser/media_observer.h
rowser/navigation_controller.cc
rowser/navigation_controller.h
rowser/page_navigator.cc
rowser/page_navigator.h
rowser/plugin_data_remover.h
rowser/plugin_service.h
rowser/plugin_service_filter.h
rowser/resource_dispatcher_host_delegate.h
rowser/resource_request_details.h
rowser/resource_request_info.h
rowser/utility_process_host.h
rowser/web_contents.h
rowser/web_contents_delegate.h
hild/resource_dispatcher_delegate.h
ommon/common_param_traits_macros.h
ommon/content_restriction.h
ommon/content_switches.cc
ommon/content_switches.h
ommon/pepper_plugin_info.cc
ommon/pepper_plugin_info.h
ommon/resource_dispatcher_delegate.h
ommon/resource_response.h
ommon/webplugininfo.cc
ommon/webplugininfo.h
enderer/content_renderer_client.h
enderer/render_thread.h
enderer/render_view.h
est/OWNERS
est/mock_render_thread.h
est/render_view_fake_resources_test.cc
est/test_browser_thread_bundle.cc
est/test_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
ndroid/java/src/org/chromium/content/browser/ContentViewCore.java
ndroid/java/src/org/chromium/content/browser/ContentViewGestureHandler.java
ndroid/java/src/org/chromium/content/browser/SnapScrollController.java
ndroid/java/src/org/chromium/content/browser/VSyncMonitor.java
ndroid/java/src/org/chromium/content/browser/accessibility/AccessibilityInjector.java
ndroid/java/src/org/chromium/content/browser/accessibility/BrowserAccessibilityManager.java
ndroid/java/src/org/chromium/content/browser/input/DateDialogNormalizer.java
ndroid/java/src/org/chromium/content/browser/input/InputDialogContainer.java
ndroid/java/src/org/chromium/content/browser/input/TimeDialog.java
ndroid/javatests/src/org/chromium/content/browser/ContentViewGestureHandlerTest.java
rowser/android/synchronous_compositor_client.h
rowser/navigation_controller.h
rowser/plugin_service.h
rowser/web_contents.h
ommon/common_param_traits_macros.h
est/download_test_observer.cc
est/fake_speech_recognition_manager.cc
est/layouttest_support.h
est/mock_render_process_host.cc
est/render_view_fake_resources_test.h
est/render_view_test.h
est/test_browser_thread.cc
est/test_browser_thread_bundle.cc
est/test_navigation_observer.cc
est/test_renderer_host.h
est/test_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/java/resource_map/OWNERS
ndroid/java/src/org/chromium/content/browser/ActivityContentVideoViewClient.java
ndroid/java/src/org/chromium/content/browser/ChildProcessLauncher.java
ndroid/java/src/org/chromium/content/browser/ContentVideoView.java
ndroid/java/src/org/chromium/content/browser/ContentVideoViewClient.java
ndroid/java/src/org/chromium/content/browser/ContentVideoViewControls.java
ndroid/java/src/org/chromium/content/browser/ContentView.java
ndroid/java/src/org/chromium/content/browser/ContentViewCore.java
ndroid/java/src/org/chromium/content/browser/ContentViewGestureHandler.java
ndroid/java/src/org/chromium/content/browser/SpeechRecognition.java
ndroid/java/src/org/chromium/content/browser/input/AdapterInputConnection.java
ndroid/java/src/org/chromium/content/browser/input/ImeAdapter.java
ndroid/javatests/src/org/chromium/content/browser/ContentViewGestureHandlerTest.java
ndroid/javatests/src/org/chromium/content/browser/input/ImeTest.java
rowser/access_token_store.h
rowser/android/compositor.h
rowser/android/compositor_client.h
rowser/android/synchronous_compositor.h
rowser/android/synchronous_compositor_client.h
rowser/browser_context.h
rowser/browser_message_filter.cc
rowser/browser_message_filter.h
rowser/browser_plugin_guest_delegate.cc
rowser/browser_plugin_guest_delegate.h
rowser/browser_ppapi_host.h
rowser/browser_thread_delegate.h
rowser/child_process_security_policy.h
rowser/content_browser_client.cc
rowser/content_browser_client.h
rowser/devtools_agent_host.h
rowser/download_id.h
rowser/download_item.h
rowser/download_manager.h
rowser/download_manager_delegate.cc
rowser/download_manager_delegate.h
rowser/download_url_parameters.cc
rowser/download_url_parameters.h
rowser/favicon_status.h
rowser/indexed_db_info.h
rowser/javascript_dialog_manager.h
rowser/load_from_memory_cache_details.h
rowser/load_notification_details.h
rowser/location_provider.h
rowser/media_observer.h
rowser/navigation_controller.h
rowser/navigation_details.h
rowser/notification_registrar.cc
rowser/page_navigator.cc
rowser/page_navigator.h
rowser/render_view_host.h
rowser/render_widget_host.h
rowser/resource_dispatcher_host.h
rowser/resource_request_details.h
rowser/site_instance.h
rowser/speech_recognition_manager_delegate.h
rowser/speech_recognition_preferences.h
rowser/stream_handle.h
rowser/web_contents_delegate.cc
rowser/web_contents_delegate.h
rowser/web_contents_observer.h
rowser/worker_service.h
ommon/common_param_traits.h
ommon/content_client.cc
ommon/content_client.h
ommon/content_constants.cc
ommon/content_constants.h
ommon/content_switches.cc
ommon/content_switches.h
ommon/context_menu_params.h
ommon/favicon_url.h
ommon/file_chooser_params.h
ommon/frame_navigate_params.h
ommon/media_stream_request.cc
ommon/media_stream_request.h
ommon/menu_item.cc
ommon/menu_item.h
ommon/page_transition_types.cc
ommon/page_transition_types.h
ommon/page_transition_types_list.h
ommon/password_form.h
ommon/referrer.h
ommon/resource_response.h
ommon/show_desktop_notification_params.h
ommon/url_constants.cc
ommon/url_constants.h
ommon/url_utils.cc
enderer/content_renderer_client.cc
enderer/content_renderer_client.h
enderer/render_thread.h
enderer/render_view.h
est/android/javatests/src/org/chromium/content/browser/test/util/DOMUtils.java
est/browser_test_utils.cc
est/browser_test_utils.h
est/download_test_observer.cc
est/download_test_observer.h
est/fake_speech_recognition_manager.cc
est/fake_speech_recognition_manager.h
est/layouttest_support.h
est/mock_download_item.h
est/mock_download_manager.cc
est/mock_download_manager.h
est/mock_render_process_host.cc
est/render_view_fake_resources_test.cc
est/test_browser_context.cc
est/test_browser_context.h
est/test_browser_thread_bundle.cc
est/test_file_error_injector.cc
est/test_renderer_host.cc
est/test_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/java/res/layout/month_picker.xml
ndroid/java/res/layout/two_field_date_picker.xml
ndroid/java/resource_map/org/chromium/content/R.java
ndroid/java/src/org/chromium/content/app/SandboxedProcessService.java
ndroid/java/src/org/chromium/content/app/SandboxedProcessService0.java
ndroid/java/src/org/chromium/content/app/SandboxedProcessService1.java
ndroid/java/src/org/chromium/content/app/SandboxedProcessService10.java
ndroid/java/src/org/chromium/content/app/SandboxedProcessService11.java
ndroid/java/src/org/chromium/content/app/SandboxedProcessService12.java
ndroid/java/src/org/chromium/content/app/SandboxedProcessService2.java
ndroid/java/src/org/chromium/content/app/SandboxedProcessService3.java
ndroid/java/src/org/chromium/content/app/SandboxedProcessService4.java
ndroid/java/src/org/chromium/content/app/SandboxedProcessService5.java
ndroid/java/src/org/chromium/content/app/SandboxedProcessService6.java
ndroid/java/src/org/chromium/content/app/SandboxedProcessService7.java
ndroid/java/src/org/chromium/content/app/SandboxedProcessService8.java
ndroid/java/src/org/chromium/content/app/SandboxedProcessService9.java
ndroid/java/src/org/chromium/content/browser/AndroidBrowserProcess.java
ndroid/java/src/org/chromium/content/browser/ChildProcessConnection.java
ndroid/java/src/org/chromium/content/browser/ChildProcessLauncher.java
ndroid/java/src/org/chromium/content/browser/ContentView.java
ndroid/java/src/org/chromium/content/browser/ContentViewCore.java
ndroid/java/src/org/chromium/content/browser/ContentViewGestureHandler.java
ndroid/java/src/org/chromium/content/browser/JellyBeanContentView.java
ndroid/java/src/org/chromium/content/browser/LocationProvider.java
ndroid/java/src/org/chromium/content/browser/accessibility/AccessibilityInjector.java
ndroid/java/src/org/chromium/content/browser/accessibility/BrowserAccessibilityManager.java
ndroid/java/src/org/chromium/content/browser/accessibility/JellyBeanAccessibilityInjector.java
ndroid/java/src/org/chromium/content/browser/accessibility/JellyBeanBrowserAccessibilityManager.java
ndroid/java/src/org/chromium/content/browser/input/DateTimeChooserAndroid.java
ndroid/java/src/org/chromium/content/browser/input/ImeAdapter.java
ndroid/java/src/org/chromium/content/browser/input/InputDialogContainer.java
ndroid/java/src/org/chromium/content/browser/input/MonthPicker.java
ndroid/java/src/org/chromium/content/browser/input/MonthPickerDialog.java
ndroid/java/src/org/chromium/content/browser/input/TwoFieldDatePicker.java
ndroid/java/src/org/chromium/content/browser/input/TwoFieldDatePickerDialog.java
ndroid/java/src/org/chromium/content/browser/input/WeekPicker.java
ndroid/java/src/org/chromium/content/browser/input/WeekPickerDialog.java
ndroid/java/strings/android_content_strings.grd
rowser/android/OWNERS
rowser/browser_thread.h
rowser/content_browser_client.h
rowser/devtools_http_handler.h
rowser/download_manager.h
rowser/download_manager_delegate.h
rowser/download_url_parameters.cc
rowser/download_url_parameters.h
rowser/histogram_fetcher.h
rowser/indexed_db_context.h
rowser/indexed_db_info.h
rowser/load_notification_details.h
rowser/media_devices_monitor.h
rowser/navigation_entry.h
rowser/plugin_data_remover.h
rowser/render_process_host.h
rowser/render_view_host.h
rowser/render_widget_host.h
rowser/render_widget_host_view_mac_delegate.h
rowser/resource_dispatcher_host.h
rowser/resource_dispatcher_host_delegate.cc
rowser/resource_dispatcher_host_delegate.h
rowser/web_contents.h
rowser/web_contents_delegate.cc
rowser/web_contents_delegate.h
rowser/web_contents_observer.h
rowser/web_contents_view.h
rowser/web_contents_view_delegate.h
rowser/web_drag_dest_delegate.h
hild/image_decoder_utils.h
ommon/content_client.h
ommon/content_switches.cc
ommon/content_switches.h
ommon/context_menu_params.h
ommon/context_menu_source_type.h
ommon/drop_data.cc
ommon/drop_data.h
ommon/geoposition.h
ommon/page_state.cc
ommon/page_state_ios.cc
ommon/page_state_webkit.cc
ommon/password_form.cc
ommon/password_form.h
ommon/socket_permission_request.h
ommon/url_constants.cc
ommon/url_constants.h
enderer/DEPS
enderer/content_renderer_client.cc
enderer/content_renderer_client.h
enderer/document_state.h
enderer/history_item_serialization.cc
est/android/OWNERS
est/android/javatests/src/org/chromium/content/browser/test/NestedSystemMessageHandler.java
est/browser_test_base.h
est/browser_test_utils.cc
est/download_test_observer.cc
est/download_test_observer.h
est/mock_download_item.h
est/mock_render_process_host.cc
est/mock_render_process_host.h
est/nested_message_pump_android.cc
est/nested_message_pump_android.h
est/render_view_fake_resources_test.cc
est/test_launcher.cc
est/test_launcher.h
est/test_utils.cc
est/test_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
ndroid/java/src/org/chromium/content/browser/ContentVideoView.java
ndroid/java/src/org/chromium/content/browser/ContentView.java
ndroid/java/src/org/chromium/content/browser/DeviceMotionAndOrientation.java
ndroid/java/src/org/chromium/content/browser/SpeechRecognition.java
ndroid/java/src/org/chromium/content/browser/SpeechRecognitionError.template
ndroid/java/src/org/chromium/content/browser/input/SelectionHandleController.java
ndroid/java/src/org/chromium/content/common/TraceEvent.java
ndroid/javatests/src/org/chromium/content/browser/DeviceMotionAndOrientationTest.java
rowser/access_token_store.h
rowser/android/synchronous_compositor.h
rowser/android/synchronous_compositor_client.h
rowser/browser_child_process_host.h
rowser/browser_context.h
rowser/browser_ppapi_host.h
rowser/child_process_data.h
rowser/content_browser_client.cc
rowser/content_browser_client.h
rowser/download_id.h
rowser/download_item.h
rowser/indexed_db_context.h
rowser/javascript_dialog_manager.h
rowser/location_provider.h
rowser/native_web_keyboard_event.h
rowser/navigation_controller.h
rowser/navigation_entry.h
rowser/plugin_service.h
rowser/render_process_host.h
rowser/render_view_host.h
rowser/render_widget_host.h
rowser/render_widget_host_view.h
rowser/speech_recognition_event_listener.h
rowser/speech_recognition_manager.h
rowser/web_contents.h
rowser/web_contents_delegate.cc
rowser/web_contents_delegate.h
rowser/web_contents_observer.h
rowser/web_contents_view.h
rowser/web_contents_view_delegate.h
rowser/web_drag_dest_delegate.h
rowser/web_ui.h
rowser/web_ui_controller.h
rowser/web_ui_data_source.h
rowser/web_ui_message_handler.h
rowser/worker_service_observer.h
ommon/common_param_traits_macros.h
ommon/content_client.h
ommon/content_switches.cc
ommon/content_switches.h
ommon/context_menu_params.h
ommon/context_menu_source_type.h
ommon/file_chooser_params.h
ommon/page_state_webkit.cc
ommon/renderer_preferences.h
ommon/sandbox_init.h
ommon/show_desktop_notification_params.h
ommon/speech_recognition_result.h
ommon/window_container_type.cc
lugin/content_plugin_client.h
enderer/content_renderer_client.cc
enderer/content_renderer_client.h
enderer/document_state.h
enderer/render_thread.h
enderer/render_view.h
enderer/render_view_observer.h
est/browser_test_utils.cc
est/browser_test_utils.h
est/mock_download_item.h
est/mock_render_process_host.cc
est/mock_render_process_host.h
est/mock_render_thread.cc
est/mock_render_thread.h
est/render_view_fake_resources_test.cc
est/render_view_test.cc
est/render_view_test.h
est/render_widget_test.cc
est/test_launcher.cc
est/test_launcher.h
est/test_renderer_host.cc
est/test_utils.cc
est/test_utils.h
est/unittest_test_suite.cc
5e3f23d412006dc4db4e659864679f29341e113f 11-Jun-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r205548

This commit was generated by merge_to_master.py.

Change-Id: I6d3c83f1b6c91aecc6bd4bf93562314356dd44b9
ommon/renderer_preferences.cc
ommon/renderer_preferences.h
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
ndroid/java/src/org/chromium/content/browser/ActivityContentVideoViewClient.java
ndroid/java/src/org/chromium/content/browser/ActivityContentVideoViewDelegate.java
ndroid/java/src/org/chromium/content/browser/ContentVideoView.java
ndroid/java/src/org/chromium/content/browser/ContentVideoViewClient.java
ndroid/java/src/org/chromium/content/browser/ContentVideoViewContextDelegate.java
ndroid/java/src/org/chromium/content/browser/ContentViewClient.java
ndroid/java/src/org/chromium/content/browser/ContentViewCore.java
ndroid/java/src/org/chromium/content/browser/ContentViewDownloadDelegate.java
ndroid/java/src/org/chromium/content/browser/ContentViewGestureHandler.java
ndroid/java/src/org/chromium/content/browser/ContentViewRenderView.java
ndroid/java/src/org/chromium/content/browser/DownloadController.java
ndroid/java/src/org/chromium/content/browser/SmoothScroller.java
ndroid/java/src/org/chromium/content/browser/TouchPoint.java
ndroid/java/src/org/chromium/content/browser/input/AdapterInputConnection.java
ndroid/java/src/org/chromium/content/browser/input/DateDialogNormalizer.java
ndroid/java/src/org/chromium/content/browser/input/DateTimeChooserAndroid.java
ndroid/java/src/org/chromium/content/browser/input/DateTimePickerDialog.java
ndroid/java/src/org/chromium/content/browser/input/InputDialogContainer.java
ndroid/java/src/org/chromium/content/browser/input/MonthPicker.java
ndroid/java/src/org/chromium/content/browser/input/MonthPickerDialog.java
ndroid/java/src/org/chromium/content/browser/input/TimeDialog.java
ndroid/java/src/org/chromium/content/common/TraceEvent.java
ndroid/javatests/src/org/chromium/content/browser/ContentViewGestureHandlerTest.java
ndroid/javatests/src/org/chromium/content/browser/input/InsertionHandleTest.java
rowser/android/compositor.h
rowser/android/synchronous_compositor.h
rowser/android/synchronous_compositor_client.h
rowser/browser_context.h
rowser/browser_message_filter.cc
rowser/browser_thread.h
rowser/child_process_security_policy.h
rowser/content_browser_client.h
rowser/download_item.h
rowser/download_manager.h
rowser/gpu_data_manager_observer.h
rowser/navigation_controller.h
rowser/quota_permission_context.h
rowser/render_frame_host.h
rowser/render_process_host_factory.h
rowser/resource_request_info.h
rowser/speech_recognition_manager.h
rowser/user_metrics.h
rowser/web_contents.cc
rowser/web_contents.h
rowser/web_contents_delegate.cc
rowser/web_contents_observer.h
ommon/bindings_policy.h
ommon/common_param_traits_macros.h
ommon/content_paths.h
ommon/content_switches.cc
ommon/content_switches.h
ommon/context_menu_params.h
ommon/page_state_webkit.cc
ommon/password_form.h
ommon/referrer.h
ommon/speech_recognition_error.h
ommon/speech_recognition_error_list.h
ommon/url_constants.cc
ommon/url_constants.h
ommon/window_container_type.cc
enderer/android/synchronous_compositor.h
enderer/android/synchronous_compositor_client.h
enderer/content_renderer_client.cc
enderer/content_renderer_client.h
enderer/document_state.cc
enderer/document_state.h
enderer/render_frame.h
enderer/renderer_ppapi_host.h
enderer/webrtc_log_message_delegate.h
est/browser_test_utils.cc
est/download_test_observer.cc
est/fake_speech_recognition_manager.cc
est/fake_speech_recognition_manager.h
est/layouttest_support.h
est/mock_download_item.h
est/mock_download_manager.h
est/mock_render_process_host.cc
est/mock_render_process_host.h
est/mock_render_thread.cc
est/mock_render_thread.h
est/render_view_fake_resources_test.cc
est/render_view_test.cc
est/render_view_test.h
est/render_widget_test.cc
est/test_browser_context.cc
est/test_browser_thread_bundle.cc
est/test_browser_thread_bundle.h
est/test_launcher.cc
est/test_launcher.h
est/test_navigation_observer.cc
est/test_navigation_observer.h
est/test_renderer_host.cc
est/test_renderer_host.h
est/test_utils.cc
est/test_utils.h
est/unittest_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/java/src/org/chromium/content/browser/ActivityContentVideoViewDelegate.java
ndroid/java/src/org/chromium/content/browser/ContentVideoView.java
ndroid/java/src/org/chromium/content/browser/ContentVideoViewContextDelegate.java
ndroid/java/src/org/chromium/content/browser/ContentView.java
ndroid/java/src/org/chromium/content/browser/ContentViewCore.java
ndroid/java/src/org/chromium/content/browser/SmoothScroller.java
ndroid/java/src/org/chromium/content/browser/accessibility/AccessibilityInjector.java
ndroid/java/src/org/chromium/content/browser/input/DateTimePickerDialog.java
ndroid/java/src/org/chromium/content/browser/input/InputMethodManagerWrapper.java
ndroid/java/src/org/chromium/content/browser/input/MonthPicker.java
ndroid/java/src/org/chromium/content/browser/input/MonthPickerDialog.java
ndroid/java/src/org/chromium/content/common/TopControlsState.template
ndroid/javatests/src/org/chromium/content/browser/input/ImeTest.java
ndroid/javatests/src/org/chromium/content/browser/input/InsertionHandleTest.java
pp/content_main_delegate.cc
rowser/android/content_view_core.h
rowser/certificate_request_result_type.h
rowser/color_chooser.h
rowser/content_browser_client.h
rowser/download_item.h
rowser/download_manager.h
rowser/gpu_data_manager.h
rowser/navigation_entry.h
rowser/plugin_service_filter.h
rowser/resource_dispatcher_host_delegate.cc
rowser/resource_dispatcher_host_delegate.h
rowser/web_contents.h
rowser/web_contents_delegate.cc
rowser/web_contents_delegate.h
ommon/common_param_traits.cc
ommon/common_param_traits.h
ommon/common_param_traits_macros.h
ommon/content_client.cc
ommon/content_client.h
ommon/content_switches.cc
ommon/content_switches.h
ommon/context_menu_params.cc
ommon/context_menu_params.h
ommon/dx_diag_node.cc
ommon/dx_diag_node.h
ommon/favicon_url.h
ommon/file_chooser_params.h
ommon/gpu_feature_type.h
ommon/gpu_info.cc
ommon/gpu_info.h
ommon/gpu_performance_stats.h
ommon/gpu_switching_option.h
ommon/page_state.cc
ommon/page_state.h
ommon/page_state_ios.cc
ommon/page_state_webkit.cc
ommon/password_form.cc
ommon/password_form.h
ommon/top_controls_state.h
ommon/top_controls_state_list.h
ommon/url_constants.cc
ommon/url_constants.h
ommon/url_utils.cc
ommon/url_utils.h
enderer/android/synchronous_compositor.h
enderer/content_renderer_client.cc
enderer/content_renderer_client.h
enderer/history_item_serialization.cc
enderer/history_item_serialization.h
enderer/render_view.h
enderer/render_view_observer.h
enderer/renderer_ppapi_host.h
est/android/javatests/src/org/chromium/content/browser/test/util/TestInputMethodManagerWrapper.java
est/browser_test_base.cc
est/browser_test_base.h
est/download_test_observer.cc
est/download_test_observer.h
est/layouttest_support.h
est/mock_download_item.h
est/mock_download_manager.h
est/mock_render_process_host.cc
est/render_view_fake_resources_test.cc
est/render_view_test.cc
est/render_widget_test.cc
est/render_widget_test.h
est/test_file_error_injector.cc
est/test_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
ndroid/java/res/layout/month_picker.xml
ndroid/java/src/org/chromium/content/browser/AndroidBrowserProcess.java
ndroid/java/src/org/chromium/content/browser/accessibility/AccessibilityInjector.java
ndroid/java/src/org/chromium/content/browser/input/AdapterInputConnection.java
ndroid/javatests/src/org/chromium/content/browser/input/ImeTest.java
rowser/content_browser_client.cc
rowser/content_browser_client.h
rowser/download_item.h
rowser/gpu_data_manager_observer.h
ommon/content_switches.cc
ommon/content_switches.h
est/mock_download_item.h
est/mock_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
ndroid/java/src/org/chromium/content/browser/ContentSettings.java
ndroid/java/src/org/chromium/content/browser/ContentView.java
ndroid/java/src/org/chromium/content/browser/ContentViewClient.java
ndroid/java/src/org/chromium/content/browser/ContentViewCore.java
ndroid/java/src/org/chromium/content/browser/ContentViewGestureHandler.java
ndroid/java/src/org/chromium/content/browser/JellyBeanContentView.java
ndroid/java/src/org/chromium/content/browser/SmoothScroller.java
ndroid/java/src/org/chromium/content/browser/ZoomManager.java
ndroid/java/src/org/chromium/content/common/TraceEvent.java
ndroid/javatests/src/org/chromium/content/browser/ContentViewGestureHandlerTest.java
pp/content_main_delegate.cc
rowser/download_item.h
rowser/geolocation.h
rowser/geolocation_provider.h
rowser/render_process_host.h
rowser/render_widget_host.h
ommon/content_switches.cc
ommon/content_switches.h
enderer/android/synchronous_compositor.h
enderer/android/synchronous_compositor_client.h
est/browser_test_base.h
est/layouttest_support.h
est/mock_render_process_host.cc
est/mock_render_process_host.h
est/render_view_test.cc
est/unittest_test_suite.cc
est/web_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/java/res/values/official-command-line.xml
ndroid/java/resource_map/org/chromium/content/R.java
ndroid/java/src/org/chromium/content/app/ChildProcessService.java
ndroid/java/src/org/chromium/content/app/LibraryLoader.java
ndroid/java/src/org/chromium/content/browser/ChildProcessConnection.java
ndroid/java/src/org/chromium/content/browser/ChildProcessLauncher.java
ndroid/java/src/org/chromium/content/browser/ContainerViewDelegate.java
ndroid/java/src/org/chromium/content/browser/ContentSettings.java
ndroid/java/src/org/chromium/content/browser/ContentView.java
ndroid/java/src/org/chromium/content/browser/ContentViewClient.java
ndroid/java/src/org/chromium/content/browser/ContentViewCore.java
ndroid/java/src/org/chromium/content/browser/ContentViewDownloadDelegate.java
ndroid/java/src/org/chromium/content/browser/ContentViewGestureHandler.java
ndroid/java/src/org/chromium/content/browser/ContentViewRenderView.java
ndroid/java/src/org/chromium/content/browser/CursorController.java
ndroid/java/src/org/chromium/content/browser/DateTimeChooserAndroid.java
ndroid/java/src/org/chromium/content/browser/DateTimePickerDialog.java
ndroid/java/src/org/chromium/content/browser/DeviceMotionAndOrientation.java
ndroid/java/src/org/chromium/content/browser/DeviceOrientation.java
ndroid/java/src/org/chromium/content/browser/DeviceUtils.java
ndroid/java/src/org/chromium/content/browser/DownloadController.java
ndroid/java/src/org/chromium/content/browser/HandleView.java
ndroid/java/src/org/chromium/content/browser/ImeAdapter.java
ndroid/java/src/org/chromium/content/browser/InputDialogContainer.java
ndroid/java/src/org/chromium/content/browser/InputMethodManagerWrapper.java
ndroid/java/src/org/chromium/content/browser/InsertionHandleController.java
ndroid/java/src/org/chromium/content/browser/JellyBeanContentView.java
ndroid/java/src/org/chromium/content/browser/LongPressDetector.java
ndroid/java/src/org/chromium/content/browser/MediaResourceGetter.java
ndroid/java/src/org/chromium/content/browser/MonthPicker.java
ndroid/java/src/org/chromium/content/browser/MonthPickerDialog.java
ndroid/java/src/org/chromium/content/browser/PageInfo.java
ndroid/java/src/org/chromium/content/browser/RenderCoordinates.java
ndroid/java/src/org/chromium/content/browser/ResourceExtractor.java
ndroid/java/src/org/chromium/content/browser/SelectPopupDialog.java
ndroid/java/src/org/chromium/content/browser/SelectionHandleController.java
ndroid/java/src/org/chromium/content/browser/SnapScrollController.java
ndroid/java/src/org/chromium/content/browser/VSyncManager.java
ndroid/java/src/org/chromium/content/browser/accessibility/AccessibilityInjector.java
ndroid/java/src/org/chromium/content/browser/accessibility/JellyBeanAccessibilityInjector.java
ndroid/java/src/org/chromium/content/browser/input/AdapterInputConnection.java
ndroid/java/src/org/chromium/content/browser/input/CursorController.java
ndroid/java/src/org/chromium/content/browser/input/DateTimeChooserAndroid.java
ndroid/java/src/org/chromium/content/browser/input/DateTimePickerDialog.java
ndroid/java/src/org/chromium/content/browser/input/HandleView.java
ndroid/java/src/org/chromium/content/browser/input/ImeAdapter.java
ndroid/java/src/org/chromium/content/browser/input/InputDialogContainer.java
ndroid/java/src/org/chromium/content/browser/input/InputMethodManagerWrapper.java
ndroid/java/src/org/chromium/content/browser/input/InsertionHandleController.java
ndroid/java/src/org/chromium/content/browser/input/MonthPicker.java
ndroid/java/src/org/chromium/content/browser/input/MonthPickerDialog.java
ndroid/java/src/org/chromium/content/browser/input/SelectPopupDialog.java
ndroid/java/src/org/chromium/content/browser/input/SelectionHandleController.java
ndroid/java/src/org/chromium/content/common/CommandLine.java
ndroid/java/src/org/chromium/content/common/PerfTraceEvent.java
ndroid/java/src/org/chromium/content/common/SurfaceTextureListener.java
ndroid/java/src/org/chromium/content/common/TraceEvent.java
ndroid/java/strings/android_content_strings.grd
ndroid/java/strings/translations/android_content_strings_am.xtb
ndroid/java/strings/translations/android_content_strings_ar.xtb
ndroid/java/strings/translations/android_content_strings_bg.xtb
ndroid/java/strings/translations/android_content_strings_ca.xtb
ndroid/java/strings/translations/android_content_strings_cs.xtb
ndroid/java/strings/translations/android_content_strings_da.xtb
ndroid/java/strings/translations/android_content_strings_de.xtb
ndroid/java/strings/translations/android_content_strings_es-419.xtb
ndroid/java/strings/translations/android_content_strings_es.xtb
ndroid/java/strings/translations/android_content_strings_fa.xtb
ndroid/java/strings/translations/android_content_strings_fil.xtb
ndroid/java/strings/translations/android_content_strings_hi.xtb
ndroid/java/strings/translations/android_content_strings_hr.xtb
ndroid/java/strings/translations/android_content_strings_id.xtb
ndroid/java/strings/translations/android_content_strings_it.xtb
ndroid/java/strings/translations/android_content_strings_ja.xtb
ndroid/java/strings/translations/android_content_strings_lt.xtb
ndroid/java/strings/translations/android_content_strings_lv.xtb
ndroid/java/strings/translations/android_content_strings_no.xtb
ndroid/java/strings/translations/android_content_strings_pl.xtb
ndroid/java/strings/translations/android_content_strings_pt-BR.xtb
ndroid/java/strings/translations/android_content_strings_pt-PT.xtb
ndroid/java/strings/translations/android_content_strings_ro.xtb
ndroid/java/strings/translations/android_content_strings_ru.xtb
ndroid/java/strings/translations/android_content_strings_sk.xtb
ndroid/java/strings/translations/android_content_strings_sl.xtb
ndroid/java/strings/translations/android_content_strings_sr.xtb
ndroid/java/strings/translations/android_content_strings_sv.xtb
ndroid/java/strings/translations/android_content_strings_sw.xtb
ndroid/java/strings/translations/android_content_strings_th.xtb
ndroid/java/strings/translations/android_content_strings_tr.xtb
ndroid/java/strings/translations/android_content_strings_uk.xtb
ndroid/java/strings/translations/android_content_strings_vi.xtb
ndroid/java/strings/translations/android_content_strings_zh-CN.xtb
ndroid/java/strings/translations/android_content_strings_zh-TW.xtb
ndroid/java/templates/NativeLibraries.template
ndroid/java/templates/native_libraries_array.h
ndroid/javatests/src/org/chromium/content/browser/AddressDetectionTest.java
ndroid/javatests/src/org/chromium/content/browser/ContentDetectionTestBase.java
ndroid/javatests/src/org/chromium/content/browser/ContentViewGestureHandlerTest.java
ndroid/javatests/src/org/chromium/content/browser/ContentViewScrollingTest.java
ndroid/javatests/src/org/chromium/content/browser/DeviceMotionAndOrientationTest.java
ndroid/javatests/src/org/chromium/content/browser/EmailAddressDetectionTest.java
ndroid/javatests/src/org/chromium/content/browser/ImeTest.java
ndroid/javatests/src/org/chromium/content/browser/InsertionHandleTest.java
ndroid/javatests/src/org/chromium/content/browser/JavaBridgeArrayCoercionTest.java
ndroid/javatests/src/org/chromium/content/browser/JavaBridgeCoercionTest.java
ndroid/javatests/src/org/chromium/content/browser/PhoneNumberDetectionTest.java
ndroid/javatests/src/org/chromium/content/browser/SelectPopupTest.java
ndroid/javatests/src/org/chromium/content/browser/input/ImeTest.java
ndroid/javatests/src/org/chromium/content/browser/input/InsertionHandleTest.java
ndroid/javatests/src/org/chromium/content/browser/input/SelectPopupTest.java
rowser/OWNERS
rowser/android/compositor.h
rowser/android/content_view_core.h
rowser/android/download_controller_android.h
rowser/browser_accessibility_state.h
rowser/browser_context.h
rowser/browser_message_filter.cc
rowser/browser_ppapi_host.h
rowser/browser_thread.h
rowser/content_browser_client.cc
rowser/content_browser_client.h
rowser/cookie_store_factory.h
rowser/devtools_agent_host.h
rowser/devtools_external_agent_proxy.h
rowser/devtools_external_agent_proxy_delegate.h
rowser/devtools_http_handler_delegate.h
rowser/devtools_manager.h
rowser/download_manager.h
rowser/favicon_status.h
rowser/gpu_data_manager.h
rowser/histogram_fetcher.h
rowser/indexed_db_context.h
rowser/indexed_db_info.cc
rowser/indexed_db_info.h
rowser/load_from_memory_cache_details.h
rowser/media_observer.h
rowser/navigation_controller.cc
rowser/navigation_controller.h
rowser/notification_types.h
rowser/render_view_host.h
rowser/render_widget_host_view.h
rowser/render_widget_host_view_mac_delegate.h
rowser/resource_request_details.h
rowser/storage_partition.h
rowser/trace_controller.h
rowser/trace_subscriber.h
rowser/url_data_source.cc
rowser/url_data_source.h
rowser/web_contents.h
rowser/web_contents_delegate.cc
rowser/web_contents_delegate.h
rowser/web_ui.h
ommon/child_process_sandbox_support_linux.h
ommon/common_param_traits_macros.h
ommon/content_client.cc
ommon/content_client.h
ommon/content_switches.cc
ommon/content_switches.h
ommon/gpu_feature_type.h
ommon/media_stream_request.h
ommon/page_transition_types_list.h
ommon/password_form.h
ommon/sandbox_init.h
ommon/sandbox_linux.h
ommon/socket_permission_request.h
ommon/ssl_status.h
ommon/url_constants.cc
ommon/url_constants.h
enderer/android/OWNERS
enderer/android/synchronous_compositor.h
enderer/android/synchronous_compositor_client.h
enderer/content_renderer_client.cc
enderer/content_renderer_client.h
enderer/document_state.cc
enderer/document_state.h
enderer/navigation_state.cc
enderer/navigation_state.h
enderer/render_thread.h
enderer/render_view.h
enderer/renderer_ppapi_host.h
est/android/javatests/src/org/chromium/content/browser/test/util/DOMUtils.java
est/android/javatests/src/org/chromium/content/browser/test/util/TouchCommon.java
est/browser_test_base.cc
est/browser_test_base.h
est/content_test_suite_base.cc
est/download_test_observer.cc
est/fake_speech_recognition_manager.cc
est/layouttest_support.h
est/mock_render_process_host.cc
est/mock_render_thread.cc
est/mock_render_thread.h
est/render_view_fake_resources_test.cc
est/render_view_fake_resources_test.h
est/render_view_test.cc
est/render_view_test.h
est/test_browser_context.cc
est/test_browser_thread.cc
est/test_browser_thread.h
est/test_content_client_initializer.cc
est/test_launcher.cc
est/test_renderer_host.cc
est/test_renderer_host.h
est/test_utils.cc
est/web_contents_tester.h
2d519ce2457219605d4f472da8d2ffd469796035 10-May-2013 Marco Nelissen <marcone@google.com> Fix build

Change-Id: Ide92c3eeb3ac89bd2caa293c0ecebc129249b907
ndroid/java/src/org/chromium/content/browser/ContentVideoView.java
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
ndroid/OWNERS
ndroid/java/res/drawable-hdpi/ic_menu_search_holo_light.png
ndroid/java/res/drawable-hdpi/ic_menu_share_holo_light.png
ndroid/java/res/drawable-xhdpi/ic_menu_search_holo_light.png
ndroid/java/res/drawable-xhdpi/ic_menu_share_holo_light.png
ndroid/java/res/drawable/ic_menu_search_holo_light.png
ndroid/java/res/drawable/ic_menu_share_holo_light.png
ndroid/java/res/drawable/ondemand_overlay.9.png
ndroid/java/res/layout-land/date_time_picker_dialog.xml
ndroid/java/res/layout/date_time_picker_dialog.xml
ndroid/java/res/layout/month_picker.xml
ndroid/java/res/values/dimens.xml
ndroid/java/res/values/official-command-line.xml
ndroid/java/res/values/strings.xml
ndroid/java/resource_map/org/chromium/content/R.java
ndroid/java/src/org/chromium/content/app/AppResource.java
ndroid/java/src/org/chromium/content/app/ChildProcessService.java
ndroid/java/src/org/chromium/content/app/ContentMain.java
ndroid/java/src/org/chromium/content/app/LibraryLoader.java
ndroid/java/src/org/chromium/content/app/PrivilegedProcessService.java
ndroid/java/src/org/chromium/content/app/PrivilegedProcessService0.java
ndroid/java/src/org/chromium/content/app/PrivilegedProcessService1.java
ndroid/java/src/org/chromium/content/app/PrivilegedProcessService2.java
ndroid/java/src/org/chromium/content/app/SandboxedProcessService.java
ndroid/java/src/org/chromium/content/browser/ActivityContentVideoViewDelegate.java
ndroid/java/src/org/chromium/content/browser/AndroidBrowserProcess.java
ndroid/java/src/org/chromium/content/browser/BrowserProcessSurfaceTexture.java
ndroid/java/src/org/chromium/content/browser/ChildProcessConnection.java
ndroid/java/src/org/chromium/content/browser/ChildProcessLauncher.java
ndroid/java/src/org/chromium/content/browser/ContentSettings.java
ndroid/java/src/org/chromium/content/browser/ContentVideoView.java
ndroid/java/src/org/chromium/content/browser/ContentVideoViewContextDelegate.java
ndroid/java/src/org/chromium/content/browser/ContentView.java
ndroid/java/src/org/chromium/content/browser/ContentViewClient.java
ndroid/java/src/org/chromium/content/browser/ContentViewCore.java
ndroid/java/src/org/chromium/content/browser/ContentViewGestureHandler.java
ndroid/java/src/org/chromium/content/browser/ContentViewRenderView.java
ndroid/java/src/org/chromium/content/browser/ContentViewStatics.java
ndroid/java/src/org/chromium/content/browser/DateTimeChooserAndroid.java
ndroid/java/src/org/chromium/content/browser/DateTimePickerDialog.java
ndroid/java/src/org/chromium/content/browser/DeviceOrientation.java
ndroid/java/src/org/chromium/content/browser/DeviceUtils.java
ndroid/java/src/org/chromium/content/browser/DownloadController.java
ndroid/java/src/org/chromium/content/browser/HandleView.java
ndroid/java/src/org/chromium/content/browser/ImeAdapter.java
ndroid/java/src/org/chromium/content/browser/InputDialogContainer.java
ndroid/java/src/org/chromium/content/browser/InputMethodManagerWrapper.java
ndroid/java/src/org/chromium/content/browser/InsertionHandleController.java
ndroid/java/src/org/chromium/content/browser/InterstitialPageDelegateAndroid.java
ndroid/java/src/org/chromium/content/browser/LoadUrlParams.java
ndroid/java/src/org/chromium/content/browser/LocationProvider.java
ndroid/java/src/org/chromium/content/browser/LongPressDetector.java
ndroid/java/src/org/chromium/content/browser/MonthPicker.java
ndroid/java/src/org/chromium/content/browser/MonthPickerDialog.java
ndroid/java/src/org/chromium/content/browser/NavigationClient.java
ndroid/java/src/org/chromium/content/browser/NavigationEntry.java
ndroid/java/src/org/chromium/content/browser/NavigationHistory.java
ndroid/java/src/org/chromium/content/browser/PageTransitionTypes.template
ndroid/java/src/org/chromium/content/browser/PepperPluginManager.java
ndroid/java/src/org/chromium/content/browser/PopupZoomer.java
ndroid/java/src/org/chromium/content/browser/RenderCoordinates.java
ndroid/java/src/org/chromium/content/browser/ResourceExtractor.java
ndroid/java/src/org/chromium/content/browser/SandboxedProcessConnection.java
ndroid/java/src/org/chromium/content/browser/SandboxedProcessLauncher.java
ndroid/java/src/org/chromium/content/browser/SelectActionModeCallback.java
ndroid/java/src/org/chromium/content/browser/SelectionHandleController.java
ndroid/java/src/org/chromium/content/browser/SnapScrollController.java
ndroid/java/src/org/chromium/content/browser/TracingIntentHandler.java
ndroid/java/src/org/chromium/content/browser/WebContentsObserverAndroid.java
ndroid/java/src/org/chromium/content/browser/ZoomManager.java
ndroid/java/src/org/chromium/content/browser/accessibility/AccessibilityInjector.java
ndroid/java/src/org/chromium/content/browser/accessibility/JellyBeanAccessibilityInjector.java
ndroid/java/src/org/chromium/content/browser/third_party/GestureDetector.java
ndroid/java/src/org/chromium/content/common/CleanupReference.java
ndroid/java/src/org/chromium/content/common/CommandLine.java
ndroid/java/src/org/chromium/content/common/DeviceInfo.java
ndroid/java/src/org/chromium/content/common/DeviceTelephonyInfo.java
ndroid/java/src/org/chromium/content/common/IChildProcessCallback.aidl
ndroid/java/src/org/chromium/content/common/IChildProcessService.aidl
ndroid/java/src/org/chromium/content/common/ISandboxedProcessCallback.aidl
ndroid/java/src/org/chromium/content/common/ISandboxedProcessService.aidl
ndroid/java/src/org/chromium/content/common/ProcessInitException.java
ndroid/java/src/org/chromium/content/common/ResultCodes.template
ndroid/java/src/org/chromium/content/common/SurfaceCallback.java
ndroid/java/src/org/chromium/content/common/TraceEvent.java
ndroid/java/src/org/chromium/content/common/common.aidl
ndroid/java/strings/android_content_strings.grd
ndroid/java/strings/translations/android_content_strings_ar.xtb
ndroid/java/strings/translations/android_content_strings_bg.xtb
ndroid/java/strings/translations/android_content_strings_ca.xtb
ndroid/java/strings/translations/android_content_strings_cs.xtb
ndroid/java/strings/translations/android_content_strings_da.xtb
ndroid/java/strings/translations/android_content_strings_de.xtb
ndroid/java/strings/translations/android_content_strings_el.xtb
ndroid/java/strings/translations/android_content_strings_en-GB.xtb
ndroid/java/strings/translations/android_content_strings_es-419.xtb
ndroid/java/strings/translations/android_content_strings_es.xtb
ndroid/java/strings/translations/android_content_strings_fa.xtb
ndroid/java/strings/translations/android_content_strings_fi.xtb
ndroid/java/strings/translations/android_content_strings_fil.xtb
ndroid/java/strings/translations/android_content_strings_fr.xtb
ndroid/java/strings/translations/android_content_strings_hi.xtb
ndroid/java/strings/translations/android_content_strings_hr.xtb
ndroid/java/strings/translations/android_content_strings_hu.xtb
ndroid/java/strings/translations/android_content_strings_id.xtb
ndroid/java/strings/translations/android_content_strings_it.xtb
ndroid/java/strings/translations/android_content_strings_iw.xtb
ndroid/java/strings/translations/android_content_strings_ja.xtb
ndroid/java/strings/translations/android_content_strings_ko.xtb
ndroid/java/strings/translations/android_content_strings_lt.xtb
ndroid/java/strings/translations/android_content_strings_lv.xtb
ndroid/java/strings/translations/android_content_strings_nl.xtb
ndroid/java/strings/translations/android_content_strings_no.xtb
ndroid/java/strings/translations/android_content_strings_pl.xtb
ndroid/java/strings/translations/android_content_strings_pt-BR.xtb
ndroid/java/strings/translations/android_content_strings_pt-PT.xtb
ndroid/java/strings/translations/android_content_strings_ro.xtb
ndroid/java/strings/translations/android_content_strings_ru.xtb
ndroid/java/strings/translations/android_content_strings_sk.xtb
ndroid/java/strings/translations/android_content_strings_sl.xtb
ndroid/java/strings/translations/android_content_strings_sr.xtb
ndroid/java/strings/translations/android_content_strings_sv.xtb
ndroid/java/strings/translations/android_content_strings_th.xtb
ndroid/java/strings/translations/android_content_strings_tr.xtb
ndroid/java/strings/translations/android_content_strings_uk.xtb
ndroid/java/strings/translations/android_content_strings_vi.xtb
ndroid/java/strings/translations/android_content_strings_zh-CN.xtb
ndroid/java/strings/translations/android_content_strings_zh-TW.xtb
ndroid/javatests/src/org/chromium/content/browser/AddressDetectionTest.java
ndroid/javatests/src/org/chromium/content/browser/ClickListenerTest.java
ndroid/javatests/src/org/chromium/content/browser/CommandLineTest.java
ndroid/javatests/src/org/chromium/content/browser/ContentDetectionTestBase.java
ndroid/javatests/src/org/chromium/content/browser/ContentViewGestureHandlerTest.java
ndroid/javatests/src/org/chromium/content/browser/ContentViewPopupZoomerTest.java
ndroid/javatests/src/org/chromium/content/browser/ContentViewScrollingTest.java
ndroid/javatests/src/org/chromium/content/browser/ContentViewTestBase.java
ndroid/javatests/src/org/chromium/content/browser/EmailAddressDetectionTest.java
ndroid/javatests/src/org/chromium/content/browser/EncodeHtmlDataUriTest.java
ndroid/javatests/src/org/chromium/content/browser/GestureDetectorResetTest.java
ndroid/javatests/src/org/chromium/content/browser/ImeTest.java
ndroid/javatests/src/org/chromium/content/browser/ImportantFileWriterAndroidTest.java
ndroid/javatests/src/org/chromium/content/browser/InsertionHandleTest.java
ndroid/javatests/src/org/chromium/content/browser/InterstitialPageTest.java
ndroid/javatests/src/org/chromium/content/browser/JavaBridgeArrayCoercionTest.java
ndroid/javatests/src/org/chromium/content/browser/JavaBridgeBasicsTest.java
ndroid/javatests/src/org/chromium/content/browser/JavaBridgeFieldsTest.java
ndroid/javatests/src/org/chromium/content/browser/JavaBridgeReturnValuesTest.java
ndroid/javatests/src/org/chromium/content/browser/LocationProviderTest.java
ndroid/javatests/src/org/chromium/content/browser/LongPressDetectorTest.java
ndroid/javatests/src/org/chromium/content/browser/NavigationTest.java
ndroid/javatests/src/org/chromium/content/browser/PhoneNumberDetectionTest.java
ndroid/javatests/src/org/chromium/content/browser/PopupZoomerTest.java
ndroid/javatests/src/org/chromium/content/browser/SelectPopupTest.java
ndroid/javatests/src/org/chromium/content/browser/TestsJavaScriptEvalTest.java
ndroid/javatests/src/org/chromium/content/browser/ViewportTest.java
ndroid/javatests/src/org/chromium/content/common/CleanupReferenceTest.java
rowser/android/compositor.h
rowser/android/content_view_core.h
rowser/android/download_controller_android.h
rowser/android/draw_delegate.h
rowser/browser_accessibility_state.h
rowser/browser_child_process_host.h
rowser/browser_child_process_host_iterator.cc
rowser/browser_child_process_host_iterator.h
rowser/browser_child_process_observer.cc
rowser/browser_child_process_observer.h
rowser/browser_context.h
rowser/browser_ipc_logging.h
rowser/browser_main_parts.h
rowser/browser_ppapi_host.h
rowser/browser_thread.h
rowser/child_process_data.h
rowser/child_process_security_policy.h
rowser/color_chooser.h
rowser/content_browser_client.cc
rowser/content_browser_client.h
rowser/content_ipc_logging.h
rowser/devtools_agent_host.h
rowser/devtools_agent_host_registry.h
rowser/devtools_client_host.h
rowser/devtools_frontend_host_delegate.h
rowser/devtools_http_handler.h
rowser/devtools_http_handler_delegate.h
rowser/devtools_manager.h
rowser/download_danger_type.h
rowser/download_interrupt_reason_values.h
rowser/download_item.h
rowser/download_manager.h
rowser/download_manager_delegate.cc
rowser/download_manager_delegate.h
rowser/download_persistent_store_info.cc
rowser/download_persistent_store_info.h
rowser/download_save_info.h
rowser/download_url_parameters.h
rowser/gpu_data_manager.h
rowser/gpu_data_manager_observer.h
rowser/host_zoom_map.h
rowser/indexed_db_context.h
rowser/javascript_dialog_manager.cc
rowser/javascript_dialog_manager.h
rowser/javascript_dialogs.h
rowser/keyboard_listener.h
rowser/media_devices_monitor.h
rowser/media_observer.h
rowser/navigation_controller.cc
rowser/navigation_controller.h
rowser/navigation_entry.h
rowser/notification_types.h
rowser/overscroll_configuration.h
rowser/page_navigator.cc
rowser/page_navigator.h
rowser/pepper_flash_settings_helper.h
rowser/plugin_service.h
rowser/plugin_service_filter.h
rowser/power_save_blocker.h
rowser/profiler_subscriber.h
rowser/render_process_host.h
rowser/render_view_host.h
rowser/render_widget_host.h
rowser/render_widget_host_view.h
rowser/resource_context.h
rowser/resource_controller.h
rowser/resource_dispatcher_host.h
rowser/resource_dispatcher_host_delegate.cc
rowser/resource_dispatcher_host_delegate.h
rowser/resource_request_info.h
rowser/site_instance.h
rowser/speech_recognition_event_listener.h
rowser/speech_recognition_manager.h
rowser/speech_recognition_session_context.cc
rowser/speech_recognition_session_context.h
rowser/storage_partition.h
rowser/stream_handle.h
rowser/trace_controller.h
rowser/url_data_source.cc
rowser/url_data_source.h
rowser/user_metrics.h
rowser/utility_process_host.h
rowser/web_contents.cc
rowser/web_contents.h
rowser/web_contents_delegate.cc
rowser/web_contents_delegate.h
rowser/web_contents_observer.cc
rowser/web_contents_observer.h
rowser/web_contents_user_data.h
rowser/web_contents_view.h
rowser/web_drag_dest_delegate.h
rowser/web_intents_dispatcher.h
rowser/web_ui_controller_factory.h
rowser/web_ui_data_source.h
rowser/web_ui_message_handler.h
rowser/worker_service.h
rowser/zygote_host_linux.h
ommon/OWNERS
ommon/child_process_host.h
ommon/common_param_traits.cc
ommon/common_param_traits.h
ommon/common_param_traits_macros.h
ommon/console_message_level.h
ommon/content_client.cc
ommon/content_client.h
ommon/content_constants.cc
ommon/content_constants.h
ommon/content_switches.cc
ommon/content_switches.h
ommon/favicon_url.cc
ommon/favicon_url.h
ommon/file_chooser_params.h
ommon/gpu_feature_type.h
ommon/gpu_info.cc
ommon/gpu_info.h
ommon/gpu_memory_stats.cc
ommon/gpu_memory_stats.h
ommon/media_stream_request.cc
ommon/media_stream_request.h
ommon/page_transition_types.h
ommon/page_transition_types_list.h
ommon/password_form.cc
ommon/password_form.h
ommon/pepper_plugin_info.h
ommon/process_type.h
ommon/renderer_preferences.cc
ommon/renderer_preferences.h
ommon/result_codes.h
ommon/result_codes_list.h
ommon/sandbox_init.cc
ommon/sandbox_init.h
ommon/sandboxed_process_launcher_delegate.h
ommon/serialized_script_value.cc
ommon/serialized_script_value.h
ommon/speech_recognition_result.h
ommon/three_d_api_types.h
ommon/url_constants.cc
ommon/url_constants.h
ommon/window_container_type.cc
ommon/zygote_fork_delegate_linux.h
lugin/content_plugin_client.h
enderer/android_content_detection_prefixes.cc
enderer/android_content_detection_prefixes.h
enderer/content_renderer_client.cc
enderer/content_renderer_client.h
enderer/document_state.h
enderer/navigation_state.h
enderer/render_thread.h
enderer/render_view.h
enderer/render_view_observer.cc
enderer/render_view_observer.h
enderer/renderer_ppapi_host.h
est/OWNERS
est/accessibility_test_utils_win.cc
est/accessibility_test_utils_win.h
est/android/javatests/src/org/chromium/content/browser/test/util/CallbackHelper.java
est/android/javatests/src/org/chromium/content/browser/test/util/DOMUtils.java
est/android/javatests/src/org/chromium/content/browser/test/util/HistoryUtils.java
est/android/javatests/src/org/chromium/content/browser/test/util/JavaScriptUtils.java
est/android/javatests/src/org/chromium/content/browser/test/util/TestCallbackHelperContainer.java
est/android/javatests/src/org/chromium/content/browser/test/util/TestContentViewClient.java
est/android/javatests/src/org/chromium/content/browser/test/util/TestContentViewClientWrapper.java
est/android/javatests/src/org/chromium/content/browser/test/util/TestTouchUtils.java
est/android/javatests/src/org/chromium/content/browser/test/util/TouchCommon.java
est/android/javatests/src/org/chromium/content/browser/test/util/TouchUtils.java
est/android/javatests/src/org/chromium/content/browser/test/util/UiUtils.java
est/browser_test.h
est/browser_test_base.cc
est/browser_test_base.h
est/browser_test_utils.cc
est/browser_test_utils.h
est/content_test_suite_base.cc
est/download_test_observer.cc
est/download_test_observer.h
est/fake_speech_recognition_manager.cc
est/fake_speech_recognition_manager.h
est/layouttest_support.h
est/mock_download_item.h
est/mock_download_manager.cc
est/mock_download_manager.h
est/mock_render_process_host.cc
est/mock_render_process_host.h
est/mock_render_thread.cc
est/mock_render_thread.h
est/mock_resource_context.cc
est/render_view_fake_resources_test.cc
est/render_view_fake_resources_test.h
est/render_view_test.cc
est/render_view_test.h
est/render_widget_test.cc
est/render_widget_test.h
est/test_browser_context.cc
est/test_browser_context.h
est/test_browser_thread.cc
est/test_browser_thread.h
est/test_file_error_injector.cc
est/test_launcher.cc
est/test_launcher.h
est/test_navigation_observer.cc
est/test_navigation_observer.h
est/test_renderer_host.cc
est/test_utils.cc
est/test_utils.h
est/unittest_test_suite.cc
est/web_contents_tester.cc
est/web_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
ndroid/DEPS
ndroid/OWNERS
ndroid/java/src/org/chromium/content/app/AppResource.java
ndroid/java/src/org/chromium/content/app/ContentMain.java
ndroid/java/src/org/chromium/content/app/LibraryLoader.java
ndroid/java/src/org/chromium/content/app/SandboxedProcessService.java
ndroid/java/src/org/chromium/content/app/SandboxedProcessService0.java
ndroid/java/src/org/chromium/content/app/SandboxedProcessService1.java
ndroid/java/src/org/chromium/content/app/SandboxedProcessService2.java
ndroid/java/src/org/chromium/content/app/SandboxedProcessService3.java
ndroid/java/src/org/chromium/content/app/SandboxedProcessService4.java
ndroid/java/src/org/chromium/content/app/SandboxedProcessService5.java
ndroid/java/src/org/chromium/content/browser/AndroidBrowserProcess.java
ndroid/java/src/org/chromium/content/browser/BrowserProcessSurfaceTexture.java
ndroid/java/src/org/chromium/content/browser/ContainerViewDelegate.java
ndroid/java/src/org/chromium/content/browser/ContentSettings.java
ndroid/java/src/org/chromium/content/browser/ContentVideoView.java
ndroid/java/src/org/chromium/content/browser/ContentView.java
ndroid/java/src/org/chromium/content/browser/ContentViewClient.java
ndroid/java/src/org/chromium/content/browser/ContentViewCore.java
ndroid/java/src/org/chromium/content/browser/ContentViewDownloadDelegate.java
ndroid/java/src/org/chromium/content/browser/ContentViewGestureHandler.java
ndroid/java/src/org/chromium/content/browser/ContentViewRenderView.java
ndroid/java/src/org/chromium/content/browser/ContentViewStatics.java
ndroid/java/src/org/chromium/content/browser/CursorController.java
ndroid/java/src/org/chromium/content/browser/DateTimePickerDialog.java
ndroid/java/src/org/chromium/content/browser/DeviceOrientation.java
ndroid/java/src/org/chromium/content/browser/DeviceUtils.java
ndroid/java/src/org/chromium/content/browser/DownloadController.java
ndroid/java/src/org/chromium/content/browser/FileDescriptorInfo.java
ndroid/java/src/org/chromium/content/browser/HandleView.java
ndroid/java/src/org/chromium/content/browser/HeapStatsLogger.java
ndroid/java/src/org/chromium/content/browser/ImeAdapter.java
ndroid/java/src/org/chromium/content/browser/InputDialogContainer.java
ndroid/java/src/org/chromium/content/browser/InsertionHandleController.java
ndroid/java/src/org/chromium/content/browser/JavascriptInterface.java
ndroid/java/src/org/chromium/content/browser/JellyBeanContentView.java
ndroid/java/src/org/chromium/content/browser/LoadUrlParams.java
ndroid/java/src/org/chromium/content/browser/LocationProvider.java
ndroid/java/src/org/chromium/content/browser/LongPressDetector.java
ndroid/java/src/org/chromium/content/browser/MonthPicker.java
ndroid/java/src/org/chromium/content/browser/MonthPickerDialog.java
ndroid/java/src/org/chromium/content/browser/NavigationEntry.java
ndroid/java/src/org/chromium/content/browser/NavigationHistory.java
ndroid/java/src/org/chromium/content/browser/PopupZoomer.java
ndroid/java/src/org/chromium/content/browser/ResourceExtractor.java
ndroid/java/src/org/chromium/content/browser/SandboxedProcessConnection.java
ndroid/java/src/org/chromium/content/browser/SandboxedProcessLauncher.java
ndroid/java/src/org/chromium/content/browser/SelectActionModeCallback.java
ndroid/java/src/org/chromium/content/browser/SelectPopupDialog.java
ndroid/java/src/org/chromium/content/browser/SelectionHandleController.java
ndroid/java/src/org/chromium/content/browser/TouchPoint.java
ndroid/java/src/org/chromium/content/browser/VSyncMonitor.java
ndroid/java/src/org/chromium/content/browser/WebContentsObserverAndroid.java
ndroid/java/src/org/chromium/content/browser/ZoomManager.java
ndroid/java/src/org/chromium/content/browser/accessibility/AccessibilityInjector.java
ndroid/java/src/org/chromium/content/browser/accessibility/JellyBeanAccessibilityInjector.java
ndroid/java/src/org/chromium/content/common/CleanupReference.java
ndroid/java/src/org/chromium/content/common/CommandLine.java
ndroid/java/src/org/chromium/content/common/DeviceInfo.java
ndroid/java/src/org/chromium/content/common/ISandboxedProcessCallback.aidl
ndroid/java/src/org/chromium/content/common/ISandboxedProcessService.aidl
ndroid/java/src/org/chromium/content/common/PerfTraceEvent.java
ndroid/java/src/org/chromium/content/common/SurfaceCallback.java
ndroid/java/src/org/chromium/content/common/SurfaceTextureListener.java
ndroid/java/src/org/chromium/content/common/TraceEvent.java
ndroid/java/src/org/chromium/content/common/common.aidl
ndroid/javatests/src/org/chromium/content/browser/AddressDetectionTest.java
ndroid/javatests/src/org/chromium/content/browser/ClickListenerTest.java
ndroid/javatests/src/org/chromium/content/browser/ContentDetectionTestBase.java
ndroid/javatests/src/org/chromium/content/browser/ContentViewGestureHandlerTest.java
ndroid/javatests/src/org/chromium/content/browser/ContentViewScrollingTest.java
ndroid/javatests/src/org/chromium/content/browser/ContentViewTestBase.java
ndroid/javatests/src/org/chromium/content/browser/EmailAddressDetectionTest.java
ndroid/javatests/src/org/chromium/content/browser/JavaBridgeArrayCoercionTest.java
ndroid/javatests/src/org/chromium/content/browser/JavaBridgeArrayTest.java
ndroid/javatests/src/org/chromium/content/browser/JavaBridgeBasicsTest.java
ndroid/javatests/src/org/chromium/content/browser/JavaBridgeChildFrameTest.java
ndroid/javatests/src/org/chromium/content/browser/JavaBridgeCoercionTest.java
ndroid/javatests/src/org/chromium/content/browser/JavaBridgeFieldsTest.java
ndroid/javatests/src/org/chromium/content/browser/JavaBridgeReturnValuesTest.java
ndroid/javatests/src/org/chromium/content/browser/JavaBridgeTestBase.java
ndroid/javatests/src/org/chromium/content/browser/LocationProviderTest.java
ndroid/javatests/src/org/chromium/content/browser/LongPressDetectorTest.java
ndroid/javatests/src/org/chromium/content/browser/PhoneNumberDetectionTest.java
ndroid/javatests/src/org/chromium/content/browser/PopupZoomerTest.java
ndroid/javatests/src/org/chromium/content/browser/VSyncMonitorTest.java
pp/DEPS
pp/android_library_loader_hooks.h
pp/content_main.h
pp/content_main_delegate.cc
pp/content_main_delegate.h
pp/content_main_runner.h
pp/startup_helper_win.h
rowser/DEPS
rowser/OWNERS
rowser/access_token_store.h
rowser/android/OWNERS
rowser/android/compositor.h
rowser/android/content_view_core.h
rowser/android/content_view_layer_renderer.h
rowser/android/devtools_auth.h
rowser/android/download_controller_android.h
rowser/android/draw_delegate.h
rowser/browser_accessibility_state.h
rowser/browser_child_process_host.h
rowser/browser_child_process_host_delegate.cc
rowser/browser_child_process_host_delegate.h
rowser/browser_child_process_host_iterator.cc
rowser/browser_child_process_host_iterator.h
rowser/browser_context.h
rowser/browser_main_parts.cc
rowser/browser_main_parts.h
rowser/browser_main_runner.h
rowser/browser_message_filter.cc
rowser/browser_message_filter.h
rowser/browser_ppapi_host.h
rowser/browser_shutdown.h
rowser/browser_thread.h
rowser/browser_thread_delegate.h
rowser/browser_url_handler.h
rowser/cert_store.h
rowser/child_process_data.h
rowser/child_process_security_policy.h
rowser/color_chooser.h
rowser/compositor_util.h
rowser/content_browser_client.cc
rowser/content_browser_client.h
rowser/content_ipc_logging.h
rowser/devtools_agent_host_registry.h
rowser/devtools_client_host.h
rowser/devtools_frontend_host_delegate.h
rowser/devtools_http_handler.h
rowser/devtools_http_handler_delegate.h
rowser/devtools_manager.h
rowser/dom_operation_notification_details.h
rowser/dom_storage_context.h
rowser/download_danger_type.h
rowser/download_destination_observer.h
rowser/download_id.h
rowser/download_interrupt_reason_values.h
rowser/download_interrupt_reasons.h
rowser/download_item.h
rowser/download_manager.h
rowser/download_manager_delegate.cc
rowser/download_manager_delegate.h
rowser/download_persistent_store_info.cc
rowser/download_persistent_store_info.h
rowser/download_save_info.cc
rowser/download_save_info.h
rowser/download_url_parameters.cc
rowser/download_url_parameters.h
rowser/favicon_status.cc
rowser/favicon_status.h
rowser/file_descriptor_info.h
rowser/font_list_async.h
rowser/geolocation.h
rowser/geolocation_permission_context.h
rowser/global_request_id.h
rowser/gpu_data_manager.h
rowser/gpu_data_manager_observer.h
rowser/histogram_fetcher.h
rowser/host_zoom_map.h
rowser/indexed_db_context.h
rowser/interstitial_page.h
rowser/interstitial_page_delegate.h
rowser/invalidate_type.h
rowser/javascript_dialogs.h
rowser/keyboard_listener.h
rowser/load_from_memory_cache_details.cc
rowser/load_from_memory_cache_details.h
rowser/load_notification_details.h
rowser/media_observer.h
rowser/media_request_state.h
rowser/native_web_keyboard_event.h
rowser/navigation_controller.cc
rowser/navigation_controller.h
rowser/navigation_details.cc
rowser/navigation_details.h
rowser/navigation_entry.h
rowser/navigation_type.h
rowser/notification_details.h
rowser/notification_observer.h
rowser/notification_registrar.cc
rowser/notification_registrar.h
rowser/notification_service.h
rowser/notification_source.h
rowser/notification_types.h
rowser/page_navigator.cc
rowser/page_navigator.h
rowser/pepper_flash_settings_helper.h
rowser/plugin_data_remover.h
rowser/plugin_service.h
rowser/plugin_service_filter.h
rowser/profiler_controller.h
rowser/profiler_subscriber.h
rowser/quota_permission_context.h
rowser/render_process_host.h
rowser/render_process_host_factory.h
rowser/render_view_host.h
rowser/render_view_host_observer.cc
rowser/render_view_host_observer.h
rowser/render_widget_host.h
rowser/render_widget_host_view.h
rowser/render_widget_host_view_mac_base.h
rowser/render_widget_host_view_mac_delegate.h
rowser/resource_context.h
rowser/resource_controller.h
rowser/resource_dispatcher_host.h
rowser/resource_dispatcher_host_delegate.cc
rowser/resource_dispatcher_host_delegate.h
rowser/resource_dispatcher_host_login_delegate.h
rowser/resource_request_details.cc
rowser/resource_request_details.h
rowser/resource_request_info.h
rowser/resource_throttle.h
rowser/save_page_type.h
rowser/session_storage_namespace.h
rowser/site_instance.h
rowser/speech_recognition_event_listener.h
rowser/speech_recognition_manager.h
rowser/speech_recognition_manager_delegate.h
rowser/speech_recognition_preferences.h
rowser/speech_recognition_session_config.cc
rowser/speech_recognition_session_config.h
rowser/speech_recognition_session_context.cc
rowser/speech_recognition_session_context.h