Merge master-chromium into master at r278856.

4 files changed, 9 insertions, 8 deletions

diff --git a/chromium/java/com/android/webview/chromium/ResourceProvider.java b/chromium/java/com/android/webview/chromium/ResourceProvider.java
index 7f6078e..8f02852 100644
--- a/chromium/java/com/android/webview/chromium/ResourceProvider.java
+++ b/chromium/java/com/android/webview/chromium/ResourceProvider.java
@@ -281,6 +281,8 @@ public class ResourceProvider {
                 com.android.internal.R.raw.nodomain);
         AwResource.setDefaultTextEncoding(
                 com.android.internal.R.string.default_text_encoding);
+        AwResource.setConfigKeySystemUuidMapping(
+                com.android.internal.R.array.config_keySystemUuidMapping);
 
         sInitialized = true;
     }
diff --git a/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java b/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
index 48804bc..1343ab3 100644
--- a/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
+++ b/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
@@ -217,6 +217,8 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider {
         PathService.override(DIR_RESOURCE_PAKS_ANDROID,
                 "/system/framework/webview/paks");
 
+        // Make sure that ResourceProvider is initialized before starting the browser process.
+        ResourceProvider.registerResources(ActivityThread.currentApplication());
         AwBrowserProcess.start(ActivityThread.currentApplication());
         initPlatSupportLibrary();
 
diff --git a/chromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java b/chromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
index 0e3a2f8..a1daa84 100644
--- a/chromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
+++ b/chromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
@@ -54,7 +54,7 @@ import android.webkit.WebViewClient;
 import org.chromium.android_webview.AwContentsClient;
 import org.chromium.android_webview.AwContentsClientBridge;
 import org.chromium.android_webview.AwHttpAuthHandler;
-import org.chromium.android_webview.InterceptedRequestData;
+import org.chromium.android_webview.AwWebResourceResponse;
 import org.chromium.android_webview.JsPromptResultReceiver;
 import org.chromium.android_webview.JsResultReceiver;
 import org.chromium.android_webview.permission.AwPermissionRequest;
@@ -270,13 +270,13 @@ public class WebViewContentsClientAdapter extends AwContentsClient {
      * @see AwContentsClient#shouldInterceptRequest(java.lang.String)
      */
     @Override
-    public InterceptedRequestData shouldInterceptRequest(String url) {
+    public AwWebResourceResponse shouldInterceptRequest(ShouldInterceptRequestParams params) {
         TraceEvent.begin();
-        if (TRACE) Log.d(TAG, "shouldInterceptRequest=" + url);
-        WebResourceResponse response = mWebViewClient.shouldInterceptRequest(mWebView, url);
+        if (TRACE) Log.d(TAG, "shouldInterceptRequest=" + params.url);
+        WebResourceResponse response = mWebViewClient.shouldInterceptRequest(mWebView, params.url);
         TraceEvent.end();
         if (response == null) return null;
-        return new InterceptedRequestData(
+        return new AwWebResourceResponse(
                 response.getMimeType(),
                 response.getEncoding(),
                 response.getData());
diff --git a/chromium/tools/merge_from_chromium.py b/chromium/tools/merge_from_chromium.py
index 740a636..752b6ad 100755
--- a/chromium/tools/merge_from_chromium.py
+++ b/chromium/tools/merge_from_chromium.py
@@ -255,9 +255,6 @@ def _GenerateMakefiles(version, unattended):
   logging.debug('Generating makefiles ...')
 
   # TODO(torne): come up with a way to deal with hooks from DEPS properly
-  # Run libaddressinput hook as we need this to build.
-  merge_common.GetCommandStdout(['python',
-      'third_party/libaddressinput/chromium/tools/update-strings.py'])
 
   # TODO(torne): The .tmp files are generated by
   # third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp into the source