[WebView] Move files from native to browser

android_webview/browser/aw_web_contents_delegate.cc

Index: android_webview/browser/aw_web_contents_delegate.cc
diff --git a/android_webview/native/aw_web_contents_delegate.cc b/android_webview/browser/aw_web_contents_delegate.cc
similarity index 91%
rename from android_webview/native/aw_web_contents_delegate.cc
rename to android_webview/browser/aw_web_contents_delegate.cc
index 20819bba2805537371c981c9e2044d41a034fe22..7e6b7287419902bcc974e2bab0262efeb00e721b 100644
--- a/android_webview/native/aw_web_contents_delegate.cc
+++ b/android_webview/browser/aw_web_contents_delegate.cc
@@ -2,14 +2,14 @@
 // 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_web_contents_delegate.h"
+#include "android_webview/browser/aw_web_contents_delegate.h"
 
+#include "android_webview/browser/aw_contents.h"
+#include "android_webview/browser/aw_contents_io_thread_client_impl.h"
 #include "android_webview/browser/aw_javascript_dialog_manager.h"
 #include "android_webview/browser/find_helper.h"
-#include "android_webview/native/aw_contents.h"
-#include "android_webview/native/aw_contents_io_thread_client_impl.h"
-#include "android_webview/native/permission/media_access_permission_request.h"
-#include "android_webview/native/permission/permission_request_handler.h"
+#include "android_webview/browser/permission/media_access_permission_request.h"
+#include "android_webview/browser/permission/permission_request_handler.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
@@ -52,15 +52,10 @@ base::LazyInstance<AwJavaScriptDialogManager>::Leaky
     g_javascript_dialog_manager = LAZY_INSTANCE_INITIALIZER;
 }
 
-AwWebContentsDelegate::AwWebContentsDelegate(
-    JNIEnv* env,
-    jobject obj)
-    : WebContentsDelegateAndroid(env, obj),
-      is_fullscreen_(false) {
-}
+AwWebContentsDelegate::AwWebContentsDelegate(JNIEnv* env, jobject obj)
+    : WebContentsDelegateAndroid(env, obj), is_fullscreen_(false) {}
 
-AwWebContentsDelegate::~AwWebContentsDelegate() {
-}
+AwWebContentsDelegate::~AwWebContentsDelegate() {}
 
 content::JavaScriptDialogManager*
 AwWebContentsDelegate::GetJavaScriptDialogManager(WebContents* source) {
@@ -77,10 +72,8 @@ void AwWebContentsDelegate::FindReply(WebContents* web_contents,
   if (!aw_contents)
     return;
 
-  aw_contents->GetFindHelper()->HandleFindReply(request_id,
-                                                number_of_matches,
-                                                active_match_ordinal,
-                                                final_update);
+  aw_contents->GetFindHelper()->HandleFindReply(
+      request_id, number_of_matches, active_match_ordinal, final_update);
 }
 
 void AwWebContentsDelegate::CanDownload(
@@ -247,7 +240,8 @@ void AwWebContentsDelegate::RequestMediaAccessPermission(
 }
 
 void AwWebContentsDelegate::EnterFullscreenModeForTab(
-    content::WebContents* web_contents, const GURL& origin) {
+    content::WebContents* web_contents,
+    const GURL& origin) {
   WebContentsDelegateAndroid::EnterFullscreenModeForTab(web_contents, origin);
   is_fullscreen_ = true;
   web_contents->GetRenderViewHost()->GetWidget()->WasResized();
@@ -291,11 +285,13 @@ static void FilesSelectedInChooser(
     GURL url(file_path_str[i]);
     if (!url.is_valid())
       continue;
-    base::FilePath path(url.SchemeIsFile() ?
-        net::UnescapeURLComponent(url.path(),
-            net::UnescapeRule::SPACES |
-            net::UnescapeRule::URL_SPECIAL_CHARS_EXCEPT_PATH_SEPARATORS) :
-            file_path_str[i]);
+    base::FilePath path(
+        url.SchemeIsFile()
+            ? net::UnescapeURLComponent(
+                  url.path(), net::UnescapeRule::SPACES |
+                                  net::UnescapeRule::
+                                      URL_SPECIAL_CHARS_EXCEPT_PATH_SEPARATORS)
+            : file_path_str[i]);
     content::FileChooserFileInfo file_info;
     file_info.file_path = path;
     if (!display_name_str[i].empty())