[Android WebView] Populate WebKit WebPreferences correctly in browser

android_webview/native/aw_settings.h

Index: android_webview/native/aw_settings.h
diff --git a/android_webview/native/aw_settings.h b/android_webview/native/aw_settings.h
index 4c85c3e1e2ea3592587c228e285c148fe0572d91..29c477b2dadb03e978ae017a327ef300655b364d 100644
--- a/android_webview/native/aw_settings.h
+++ b/android_webview/native/aw_settings.h
@@ -12,12 +12,16 @@
 #include "base/memory/scoped_ptr.h"
 #include "content/public/browser/web_contents_observer.h"
 
+struct WebPreferences;
+
 namespace android_webview {
 
 class AwRenderViewHostExt;
 
 class AwSettings : public content::WebContentsObserver {
  public:
+  static AwSettings* FromWebContents(content::WebContents* web_contents);
+
   AwSettings(JNIEnv* env, jobject obj, jint web_contents);
   virtual ~AwSettings();
 
@@ -31,6 +35,8 @@ class AwSettings : public content::WebContentsObserver {
   void UpdateWebkitPreferencesLocked(JNIEnv* env, jobject obj);
   void UpdateFormDataPreferencesLocked(JNIEnv* env, jobject obj);
 
+  void PopulateWebPreferences(WebPreferences* web_prefs);
+
  private:
   AwRenderViewHostExt* GetAwRenderViewHostExt();
   void UpdateEverything();