Add third_party/brotli/src to the list of projects to merge.

Change-Id: I4e89adb1dfbd2baa2b57c30246a330862032732f
Add WebSettings API tracing

This seems to be useful for tracking app's interaction with WebView

Change-Id: I1a88f4d2296a822a2d1c0afe398fbc621a3352f0
Reland "automerger: download gn before generating makefiles."

This relands the original commit c673dbdbfa853ed101dfc9193a34c14b5134cc78. The gn binary build process has been fixed upstream so that it generates Debian-compatible binaries.

Change-Id: I58a418b7ca2c6ed976367d116d06f65b851fbe79
Merge "Reland "automerger: download gn before generating makefiles."" into master-chromium
Make the onScrollChange implementation a no-op.

Chromium calls this method from ContentViewCore, but it shouldn't
be called this way for the WebView.

Change-Id: I9424236bcbf00da30d223bb330c9d9a0c0cc2bbb
Merge "Add WebSettings API tracing" into master-chromium
Import translations. DO NOT MERGE

Change-Id: I8d60644097f2502f5f7a7efe74cb327d86aa8571
Auto-generated-cl: translation import
Don't strip ColorPicker resources referenced from XML.

Change-Id: Ib74f8d7a46a25b94a1684c9b05ee2ccafbdcc4ff
Update ProGuard flags to silence new notes.

Also clean up unneccesary or.chromium.* classes, as proguard
runs after JARJAR.

Change-Id: I24d379658b8d683fe05a244b573056b8f4f2efde
First jank test for Android Webview

Includes both the test, and the dummy application that is tested. Only
tests flinging. This is based on the old BrowserFlingTest, but,
since BaseBrowserFlingTest is no longer maintained, and there is only
one browser type here, it merges that code into WebViewFlingTest.

BUG=11266902
Change-Id: I7c246d5d97bb70d119cb1fab9a7c538bef17bcd1
Merge "First jank test for Android Webview" into master-chromium
Merge scripts: duplicate arm makefile for arm64.

To support multiarch arm/arm64 builds, copy the top-level makefile so
that the same makefiles will be used for arm64 as are currently used for
arm.

Change-Id: I79bff65dd57e6528ab543b090203553849c665e4
Move to the canonical UniquePtr.h.

Change-Id: Ibf1a02a98475384a1e16f69f50f3daf20c8f130c
Merge "Move to the canonical UniquePtr.h."
am fc00858f: Merge "Move to the canonical UniquePtr.h."

* commit 'fc00858f4cdc87b0e77be01ffd2cc9c8a70076b5':
  Move to the canonical UniquePtr.h.
Switch ResourceProvider to use new setters from AwResources

Upstream https://codereview.chromium.org/155653003/ introduces setter methods
for error pages and default text encoding with an intention to hide static
fields that are currently in use.

Change-Id: I70aed30ab1586ddc5206cf9ecafe5b091645c6fb
Tidy up WebViewChromiumFactoryProvider.

Clarify log message about UI thread binding and move functions
to their correct place in the file structure.

Change-Id: I4c201ba9141590b71a492e975ae6e3f40ddbdef1
Remove a not dangerous warning from skia header files

Change-Id: I0f7718cd5beaa3c2428f9617a5051f515ae5e9e0
Stop using the test constructor.

This is to match http://crrev.com/40663002/

Change-Id: I339fc44eafaf601f7eefc78d1a4a19cb5f06b05c
Reflect move of CommandLine from content/ to base/

Unblock the automerger.

Please see upstream review https://codereview.chromium.org/62333025/
for the details.

Change-Id: I967675ccfe1ede0f4eabd3f37804b61c6f21a000