[WebView] Move files from native to browser

android_webview/browser/aw_settings.cc

Index: android_webview/browser/aw_settings.cc
diff --git a/android_webview/native/aw_settings.cc b/android_webview/browser/aw_settings.cc
similarity index 94%
rename from android_webview/native/aw_settings.cc
rename to android_webview/browser/aw_settings.cc
index e59653353758f9f69bd8fd3ed0110ea659400436..e1321b4d37a28bb423616236dd2b3c99f339ff24 100644
--- a/android_webview/native/aw_settings.cc
+++ b/android_webview/browser/aw_settings.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "android_webview/native/aw_settings.h"
+#include "android_webview/browser/aw_settings.h"
 
 #include "android_webview/browser/aw_content_browser_client.h"
+#include "android_webview/browser/aw_contents.h"
 #include "android_webview/browser/renderer_host/aw_render_view_host_ext.h"
 #include "android_webview/common/aw_content_client.h"
-#include "android_webview/native/aw_contents.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/macros.h"
@@ -38,7 +38,8 @@ void PopulateFixedRendererPreferences(RendererPreferences* prefs) {
       content::TAP_MULTIPLE_TARGETS_STRATEGY_NONE;
 
   // TODO(boliu): Deduplicate with chrome/ code.
-  CR_DEFINE_STATIC_LOCAL(const gfx::FontRenderParams, params,
+  CR_DEFINE_STATIC_LOCAL(
+      const gfx::FontRenderParams, params,
       (gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(), NULL)));
   prefs->should_antialias_text = params.antialiasing;
   prefs->use_subpixel_positioning = params.subpixel_positioning;
@@ -106,16 +107,19 @@ AwSettings* AwSettings::FromWebContents(content::WebContents* web_contents) {
 }
 
 AwRenderViewHostExt* AwSettings::GetAwRenderViewHostExt() {
-  if (!web_contents()) return NULL;
+  if (!web_contents())
+    return NULL;
   AwContents* contents = AwContents::FromWebContents(web_contents());
-  if (!contents) return NULL;
+  if (!contents)
+    return NULL;
   return contents->render_view_host_ext();
 }
 
 void AwSettings::ResetScrollAndScaleState(JNIEnv* env,
                                           const JavaParamRef<jobject>& obj) {
   AwRenderViewHostExt* rvhe = GetAwRenderViewHostExt();
-  if (!rvhe) return;
+  if (!rvhe)
+    return;
   rvhe->ResetScrollAndScaleState();
 }
 
@@ -142,7 +146,8 @@ void AwSettings::UpdateEverythingLocked(JNIEnv* env,
 
 void AwSettings::UpdateUserAgentLocked(JNIEnv* env,
                                        const JavaParamRef<jobject>& obj) {
-  if (!web_contents()) return;
+  if (!web_contents())
+    return;
 
   ScopedJavaLocalRef<jstring> str =
       Java_AwSettings_getUserAgentLocked(env, obj);
@@ -162,13 +167,16 @@ void AwSettings::UpdateUserAgentLocked(JNIEnv* env,
 void AwSettings::UpdateWebkitPreferencesLocked(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj) {
-  if (!web_contents()) return;
+  if (!web_contents())
+    return;
   AwRenderViewHostExt* render_view_host_ext = GetAwRenderViewHostExt();
-  if (!render_view_host_ext) return;
+  if (!render_view_host_ext)
+    return;
 
   content::RenderViewHost* render_view_host =
       web_contents()->GetRenderViewHost();
-  if (!render_view_host) return;
+  if (!render_view_host)
+    return;
   render_view_host->OnWebkitPreferencesChanged();
 }
 
@@ -176,15 +184,16 @@ void AwSettings::UpdateInitialPageScaleLocked(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj) {
   AwRenderViewHostExt* rvhe = GetAwRenderViewHostExt();
-  if (!rvhe) return;
+  if (!rvhe)
+    return;
 
   float initial_page_scale_percent =
       Java_AwSettings_getInitialPageScalePercentLocked(env, obj);
   if (initial_page_scale_percent == 0) {
     rvhe->SetInitialPageScale(-1);
   } else {
-    float dip_scale = static_cast<float>(
-        Java_AwSettings_getDIPScaleLocked(env, obj));
+    float dip_scale =
+        static_cast<float>(Java_AwSettings_getDIPScaleLocked(env, obj));
     rvhe->SetInitialPageScale(initial_page_scale_percent / dip_scale / 100.0f);
   }
 }
@@ -192,9 +201,11 @@ void AwSettings::UpdateInitialPageScaleLocked(
 void AwSettings::UpdateFormDataPreferencesLocked(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj) {
-  if (!web_contents()) return;
+  if (!web_contents())
+    return;
   AwContents* contents = AwContents::FromWebContents(web_contents());
-  if (!contents) return;
+  if (!contents)
+    return;
 
   contents->SetSaveFormData(Java_AwSettings_getSaveFormDataLocked(env, obj));
 }
@@ -202,7 +213,8 @@ void AwSettings::UpdateFormDataPreferencesLocked(
 void AwSettings::UpdateRendererPreferencesLocked(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj) {
-  if (!web_contents()) return;
+  if (!web_contents())
+    return;
 
   bool update_prefs = false;
   RendererPreferences* prefs = web_contents()->GetMutableRendererPrefs();
@@ -260,7 +272,8 @@ void AwSettings::PopulateWebPreferencesLocked(JNIEnv* env,
                                               const JavaParamRef<jobject>& obj,
                                               jlong web_prefs_ptr) {
   AwRenderViewHostExt* render_view_host_ext = GetAwRenderViewHostExt();
-  if (!render_view_host_ext) return;
+  if (!render_view_host_ext)
+    return;
 
   WebPreferences* web_prefs = reinterpret_cast<WebPreferences*>(web_prefs_ptr);
   PopulateFixedWebPreferences(web_prefs);
@@ -376,8 +389,8 @@ void AwSettings::PopulateWebPreferencesLocked(JNIEnv* env,
 
   ScopedJavaLocalRef<jstring> url =
       Java_AwSettings_getDefaultVideoPosterURLLocked(env, obj);
-  web_prefs->default_video_poster_url = url.obj() ?
-      GURL(ConvertJavaStringToUTF8(url)) : GURL();
+  web_prefs->default_video_poster_url =
+      url.obj() ? GURL(ConvertJavaStringToUTF8(url)) : GURL();
 
   bool support_quirks = Java_AwSettings_getSupportLegacyQuirksLocked(env, obj);
   // Please see the corresponding Blink settings for bug references.
@@ -400,8 +413,8 @@ void AwSettings::PopulateWebPreferencesLocked(JNIEnv* env,
       Java_AwSettings_getSpatialNavigationLocked(env, obj);
 
   bool enable_supported_hardware_accelerated_features =
-      Java_AwSettings_getEnableSupportedHardwareAcceleratedFeaturesLocked(
-                env, obj);
+      Java_AwSettings_getEnableSupportedHardwareAcceleratedFeaturesLocked(env,
+                                                                          obj);
 
   bool accelerated_2d_canvas_enabled_by_switch =
       web_prefs->accelerated_2d_canvas_enabled;
@@ -449,8 +462,8 @@ void AwSettings::PopulateWebPreferencesLocked(JNIEnv* env,
 static jlong Init(JNIEnv* env,
                   const JavaParamRef<jobject>& obj,
                   const JavaParamRef<jobject>& web_contents) {
-  content::WebContents* contents = content::WebContents::FromJavaWebContents(
-      web_contents);
+  content::WebContents* contents =
+      content::WebContents::FromJavaWebContents(web_contents);
   AwSettings* settings = new AwSettings(env, obj, contents);
   return reinterpret_cast<intptr_t>(settings);
 }