[WebView] Move files from native to browser

android_webview/browser/aw_contents.cc

Index: android_webview/browser/aw_contents.cc
diff --git a/android_webview/native/aw_contents.cc b/android_webview/browser/aw_contents.cc
similarity index 95%
rename from android_webview/native/aw_contents.cc
rename to android_webview/browser/aw_contents.cc
index 184c687884a66a519d0073a5b3700fda32360ff8..86143f8b865c218aea07b1865b4d3dc8fa171cf3 100644
--- a/android_webview/native/aw_contents.cc
+++ b/android_webview/browser/aw_contents.cc
@@ -2,38 +2,38 @@
 // 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_contents.h"
+#include "android_webview/browser/aw_contents.h"
 
 #include <limits>
 #include <utility>
 
+#include "android_webview/browser/aw_autofill_client.h"
 #include "android_webview/browser/aw_browser_context.h"
 #include "android_webview/browser/aw_browser_main_parts.h"
+#include "android_webview/browser/aw_contents_client_bridge.h"
+#include "android_webview/browser/aw_contents_io_thread_client_impl.h"
+#include "android_webview/browser/aw_contents_lifecycle_notifier.h"
+#include "android_webview/browser/aw_gl_functor.h"
+#include "android_webview/browser/aw_pdf_exporter.h"
+#include "android_webview/browser/aw_picture.h"
+#include "android_webview/browser/aw_renderer_priority_manager.h"
 #include "android_webview/browser/aw_resource_context.h"
+#include "android_webview/browser/aw_web_contents_delegate.h"
 #include "android_webview/browser/browser_view_renderer.h"
 #include "android_webview/browser/child_frame.h"
 #include "android_webview/browser/deferred_gpu_command_service.h"
+#include "android_webview/browser/java_browser_view_renderer_helper.h"
 #include "android_webview/browser/net_disk_cache_remover.h"
+#include "android_webview/browser/permission/aw_permission_request.h"
+#include "android_webview/browser/permission/permission_request_handler.h"
+#include "android_webview/browser/permission/simple_permission_request.h"
 #include "android_webview/browser/render_thread_manager.h"
 #include "android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.h"
 #include "android_webview/browser/scoped_app_gl_state_restore.h"
+#include "android_webview/browser/state_serializer.h"
 #include "android_webview/common/aw_hit_test_data.h"
 #include "android_webview/common/aw_switches.h"
 #include "android_webview/common/devtools_instrumentation.h"
-#include "android_webview/native/aw_autofill_client.h"
-#include "android_webview/native/aw_contents_client_bridge.h"
-#include "android_webview/native/aw_contents_io_thread_client_impl.h"
-#include "android_webview/native/aw_contents_lifecycle_notifier.h"
-#include "android_webview/native/aw_gl_functor.h"
-#include "android_webview/native/aw_pdf_exporter.h"
-#include "android_webview/native/aw_picture.h"
-#include "android_webview/native/aw_renderer_priority_manager.h"
-#include "android_webview/native/aw_web_contents_delegate.h"
-#include "android_webview/native/java_browser_view_renderer_helper.h"
-#include "android_webview/native/permission/aw_permission_request.h"
-#include "android_webview/native/permission/permission_request_handler.h"
-#include "android_webview/native/permission/simple_permission_request.h"
-#include "android_webview/native/state_serializer.h"
 #include "android_webview/public/browser/draw_gl.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
@@ -146,10 +146,12 @@ AwContents* AwContents::FromWebContents(WebContents* web_contents) {
 AwContents* AwContents::FromID(int render_process_id, int render_view_id) {
   content::RenderViewHost* rvh =
       content::RenderViewHost::FromID(render_process_id, render_view_id);
-  if (!rvh) return NULL;
+  if (!rvh)
+    return NULL;
   content::WebContents* web_contents =
       content::WebContents::FromRenderViewHost(rvh);
-  if (!web_contents) return NULL;
+  if (!web_contents)
+    return NULL;
   return FromWebContents(web_contents);
 }
 
@@ -174,9 +176,10 @@ std::string AwContents::GetLocaleList() {
 
 // static
 AwBrowserPermissionRequestDelegate* AwBrowserPermissionRequestDelegate::FromID(
-    int render_process_id, int render_frame_id) {
-  AwContents* aw_contents = AwContents::FromWebContents(
-      content::WebContents::FromRenderFrameHost(
+    int render_process_id,
+    int render_frame_id) {
+  AwContents* aw_contents =
+      AwContents::FromWebContents(content::WebContents::FromRenderFrameHost(
           content::RenderFrameHost::FromID(render_process_id,
                                            render_frame_id)));
   return aw_contents;
@@ -283,8 +286,8 @@ void AwContents::SetSaveFormData(bool enabled) {
   // We need to check for the existence, since autofill_manager_delegate
   // may not be created when the setting is false.
   if (AwAutofillClient::FromWebContents(web_contents_.get())) {
-    AwAutofillClient::FromWebContents(web_contents_.get())->
-        SetSaveFormData(enabled);
+    AwAutofillClient::FromWebContents(web_contents_.get())
+        ->SetSaveFormData(enabled);
   }
 }
 
@@ -451,10 +454,7 @@ void AwContents::GenerateMHTML(JNIEnv* env,
 void AwContents::CreatePdfExporter(JNIEnv* env,
                                    const JavaParamRef<jobject>& obj,
                                    const JavaParamRef<jobject>& pdfExporter) {
-  pdf_exporter_.reset(
-      new AwPdfExporter(env,
-                        pdfExporter,
-                        web_contents_.get()));
+  pdf_exporter_.reset(new AwPdfExporter(env, pdfExporter, web_contents_.get()));
 }
 
 bool AwContents::OnReceivedHttpAuthRequest(const JavaRef<jobject>& handler,
@@ -485,8 +485,8 @@ void AwContents::AddVisitedLinks(
     const JavaParamRef<jobjectArray>& jvisited_links) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   std::vector<base::string16> visited_link_strings;
-  base::android::AppendJavaStringArrayToStringVector(
-      env, jvisited_links, &visited_link_strings);
+  base::android::AppendJavaStringArrayToStringVector(env, jvisited_links,
+                                                     &visited_link_strings);
 
   std::vector<GURL> visited_link_gurls;
   std::vector<base::string16>::const_iterator itr;
@@ -523,15 +523,12 @@ void ShowGeolocationPromptHelper(const JavaObjectWeakGlobalRef& java_ref,
   JNIEnv* env = AttachCurrentThread();
   if (java_ref.get(env).obj()) {
     content::BrowserThread::PostTask(
-        content::BrowserThread::UI,
-        FROM_HERE,
-        base::Bind(&ShowGeolocationPromptHelperTask,
-                   java_ref,
-                   origin));
+        content::BrowserThread::UI, FROM_HERE,
+        base::Bind(&ShowGeolocationPromptHelperTask, java_ref, origin));
   }
 }
 
-} // anonymous namespace
+}  // anonymous namespace
 
 void AwContents::ShowGeolocationPrompt(const GURL& requesting_frame,
                                        base::Callback<void(bool)> callback) {
@@ -592,7 +589,7 @@ void AwContents::HideGeolocationPrompt(const GURL& origin) {
     }
     if (!pending_geolocation_prompts_.empty()) {
       ShowGeolocationPromptHelper(java_ref_,
-                            pending_geolocation_prompts_.front().first);
+                                  pending_geolocation_prompts_.front().first);
     }
   }
 }
@@ -673,8 +670,8 @@ void AwContents::CancelGeolocationPermissionRequests(const GURL& origin) {
     HideGeolocationPrompt(origin);
     return;
   }
-  permission_request_handler_->CancelRequest(
-      origin, AwPermissionRequest::Geolocation);
+  permission_request_handler_->CancelRequest(origin,
+                                             AwPermissionRequest::Geolocation);
 }
 
 void AwContents::RequestMIDISysexPermission(
@@ -833,7 +830,8 @@ void AwContents::RequestNewHitTestDataAt(JNIEnv* env,
 void AwContents::UpdateLastHitTestData(JNIEnv* env,
                                        const JavaParamRef<jobject>& obj) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  if (!render_view_host_ext_->HasNewHitTestData()) return;
+  if (!render_view_host_ext_->HasNewHitTestData())
+    return;
 
   const AwHitTestData& data = render_view_host_ext_->GetLastHitTestData();
   render_view_host_ext_->MarkHitTestDataRead();
@@ -841,8 +839,8 @@ void AwContents::UpdateLastHitTestData(JNIEnv* env,
   // Make sure to null the Java object if data is empty/invalid.
   ScopedJavaLocalRef<jstring> extra_data_for_type;
   if (data.extra_data_for_type.length())
-    extra_data_for_type = ConvertUTF8ToJavaString(
-        env, data.extra_data_for_type);
+    extra_data_for_type =
+        ConvertUTF8ToJavaString(env, data.extra_data_for_type);
 
   ScopedJavaLocalRef<jstring> href;
   if (data.href.length())
@@ -1178,7 +1176,7 @@ void InvokeVisualStateCallback(const JavaObjectWeakGlobalRef& java_ref,
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref.get(env);
   if (obj.is_null())
-     return;
+    return;
   Java_AwContents_invokeVisualStateCallback(env, obj, callback, request_id);
 }
 }  // namespace
@@ -1296,8 +1294,8 @@ void AwContents::SetExtraHeadersForUrl(
   if (jextra_headers)
     extra_headers = ConvertJavaStringToUTF8(env, jextra_headers);
   AwResourceContext* resource_context = static_cast<AwResourceContext*>(
-      AwBrowserContext::FromWebContents(web_contents_.get())->
-      GetResourceContext());
+      AwBrowserContext::FromWebContents(web_contents_.get())
+          ->GetResourceContext());
   resource_context->SetExtraHeaders(GURL(ConvertJavaStringToUTF8(env, url)),
                                     extra_headers);
 }
@@ -1344,12 +1342,8 @@ void AwContents::PostMessageToFrame(JNIEnv* env,
                                     const JavaParamRef<jstring>& target_origin,
                                     const JavaParamRef<jobjectArray>& ports) {
   // Use an empty source origin for android webview.
-  content::MessagePortProvider::PostMessageToFrame(web_contents_.get(),
-                                                   env,
-                                                   nullptr,
-                                                   target_origin,
-                                                   message,
-                                                   ports);
+  content::MessagePortProvider::PostMessageToFrame(
+      web_contents_.get(), env, nullptr, target_origin, message, ports);
 }
 
 void AwContents::GrantFileSchemeAccesstoChildProcess(
@@ -1440,16 +1434,15 @@ void AwContents::OnRenderProcessGone(int child_process_id) {
   Java_AwContents_onRenderProcessGone(env, obj, child_process_id);
 }
 
-bool AwContents::OnRenderProcessGoneDetail(int child_process_id,
-                                           bool crashed) {
+bool AwContents::OnRenderProcessGoneDetail(int child_process_id, bool crashed) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (obj.is_null())
     return false;
 
-  return Java_AwContents_onRenderProcessGoneDetail(env, obj,
-      child_process_id, crashed);
+  return Java_AwContents_onRenderProcessGoneDetail(env, obj, child_process_id,
+                                                   crashed);
 }
 
 void AwContents::RenderProcessReady(content::RenderProcessHost* host) {