Currently Android WebView will push settings from the java side to the renderer, but if the browser needs to read those settings back we will use a default set from WebContentsImpl as we neglect to override ContentBrowserClient::OverrideWebKitPrefs. This means that the browser and renderer can see out of sync preference values.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@225611 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/android_webview/lib/main/aw_main_delegate.cc b/android_webview/lib/main/aw_main_delegate.cc
index 83cd27d87..7993e0c3 100644
--- a/android_webview/lib/main/aw_main_delegate.cc
+++ b/android_webview/lib/main/aw_main_delegate.cc
@@ -12,6 +12,7 @@
 #include "android_webview/native/aw_geolocation_permission_context.h"
 #include "android_webview/native/aw_quota_manager_bridge_impl.h"
 #include "android_webview/native/aw_web_contents_view_delegate.h"
+#include "android_webview/native/aw_web_preferences_populater_impl.h"
 #include "android_webview/renderer/aw_content_renderer_client.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
@@ -141,4 +142,8 @@
   return AwWebContentsViewDelegate::Create(web_contents);
 }
 
+AwWebPreferencesPopulater* AwMainDelegate::CreateWebPreferencesPopulater() {
+  return new AwWebPreferencesPopulaterImpl();
+}
+
 }  // namespace android_webview