[WebView] Move files from native to browser

android_webview/browser/android_protocol_handler.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "android_webview/native/android_protocol_handler.h"
+#include "android_webview/browser/android_protocol_handler.h"
 
 #include <utility>
 
+#include "android_webview/browser/input_stream_impl.h"
 #include "android_webview/browser/net/android_stream_reader_url_request_job.h"
 #include "android_webview/browser/net/aw_url_request_job_factory.h"
 #include "android_webview/common/url_constants.h"
-#include "android_webview/native/input_stream_impl.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/android/jni_weak_ref.h"
 #include "base/memory/ptr_util.h"
 #include "content/public/common/url_constants.h"
 #include "jni/AndroidProtocolHandler_jni.h"
 #include "net/base/io_buffer.h"
 #include "net/base/mime_util.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_util.h"
@@ skipping 73 matching lines @@
   ContentSchemeRequestInterceptor();
   bool ShouldHandleRequest(const net::URLRequest* request) const override;
 };
 
 // AndroidStreamReaderURLRequestJobDelegateImpl -------------------------------
 
 AndroidStreamReaderURLRequestJobDelegateImpl::
     AndroidStreamReaderURLRequestJobDelegateImpl() {}
 
 AndroidStreamReaderURLRequestJobDelegateImpl::
-~AndroidStreamReaderURLRequestJobDelegateImpl() {
-}
+    ~AndroidStreamReaderURLRequestJobDelegateImpl() {}
 
 std::unique_ptr<InputStream>
 AndroidStreamReaderURLRequestJobDelegateImpl::OpenInputStream(JNIEnv* env,
                                                               const GURL& url) {
   DCHECK(url.is_valid());
   DCHECK(env);
 
   // Open the input stream.
-  ScopedJavaLocalRef<jstring> jurl =
-      ConvertUTF8ToJavaString(env, url.spec());
+  ScopedJavaLocalRef<jstring> jurl = ConvertUTF8ToJavaString(env, url.spec());
   ScopedJavaLocalRef<jobject> stream =
       android_webview::Java_AndroidProtocolHandler_open(env, jurl);
 
   if (stream.is_null()) {
     DLOG(ERROR) << "Unable to open input stream for Android URL";
     return std::unique_ptr<InputStream>();
   }
   return base::MakeUnique<InputStreamImpl>(stream);
 }
 
@@ skipping 11 matching lines @@
     android_webview::InputStream* stream,
     std::string* mime_type) {
   DCHECK(env);
   DCHECK(request);
   DCHECK(mime_type);
 
   // Query the mime type from the Java side. It is possible for the query to
   // fail, as the mime type cannot be determined for all supported schemes.
   ScopedJavaLocalRef<jstring> url =
       ConvertUTF8ToJavaString(env, request->url().spec());
-  const InputStreamImpl* stream_impl =
-      InputStreamImpl::FromInputStream(stream);
+  const InputStreamImpl* stream_impl = InputStreamImpl::FromInputStream(stream);
   ScopedJavaLocalRef<jstring> returned_type =
       android_webview::Java_AndroidProtocolHandler_getMimeType(
           env, stream_impl->jobj(), url);
   if (returned_type.is_null())
     return false;
 
   *mime_type = base::android::ConvertJavaStringToUTF8(returned_type);
   return true;
 }
 
@@ skipping 35 matching lines @@
 
   std::unique_ptr<AndroidStreamReaderURLRequestJobDelegateImpl> reader_delegate(
       new AndroidStreamReaderURLRequestJobDelegateImpl());
 
   return new AndroidStreamReaderURLRequestJob(request, network_delegate,
                                               std::move(reader_delegate));
 }
 
 // AssetFileRequestInterceptor ------------------------------------------------
 
-AssetFileRequestInterceptor::AssetFileRequestInterceptor() {
-}
+AssetFileRequestInterceptor::AssetFileRequestInterceptor() {}
 
 bool AssetFileRequestInterceptor::ShouldHandleRequest(
     const net::URLRequest* request) const {
   return android_webview::IsAndroidSpecialFileUrl(request->url());
 }
 
 // ContentSchemeRequestInterceptor --------------------------------------------
 
-ContentSchemeRequestInterceptor::ContentSchemeRequestInterceptor() {
-}
+ContentSchemeRequestInterceptor::ContentSchemeRequestInterceptor() {}
 
 bool ContentSchemeRequestInterceptor::ShouldHandleRequest(
     const net::URLRequest* request) const {
   return request->url().SchemeIs(url::kContentScheme);
 }
 
 }  // namespace
 
 namespace android_webview {
 
@@ skipping 20 matching lines @@
   return ConvertUTF8ToJavaString(env, android_webview::kAndroidAssetPath);
 }
 
 static ScopedJavaLocalRef<jstring> GetAndroidResourcePath(
     JNIEnv* env,
     const JavaParamRef<jclass>& /*clazz*/) {
   return ConvertUTF8ToJavaString(env, android_webview::kAndroidResourcePath);
 }
 
 }  // namespace android_webview