[WebView] Replace AwContentsIoThreadClient, InputStream and AwWebResourceResponse

android_webview/browser/net/aw_web_resource_response.cc

 // Copyright 2014 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/browser/aw_web_resource_response_impl.h"
+#include "android_webview/browser/net/aw_web_resource_response.h"
 
-#include "android_webview/browser/input_stream_impl.h"
+#include "android_webview/browser/input_stream.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/memory/ptr_util.h"
 #include "jni/AwWebResourceResponse_jni.h"
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_job.h"
 
 using base::android::ScopedJavaLocalRef;
 using base::android::AppendJavaStringArrayToStringVector;
 
 namespace android_webview {
 
-AwWebResourceResponseImpl::AwWebResourceResponseImpl(
+AwWebResourceResponse::AwWebResourceResponse(
     const base::android::JavaRef<jobject>& obj)
     : java_object_(obj) {}
 
-AwWebResourceResponseImpl::~AwWebResourceResponseImpl() {}
+AwWebResourceResponse::~AwWebResourceResponse() {}
 
-std::unique_ptr<InputStream> AwWebResourceResponseImpl::GetInputStream(
+std::unique_ptr<InputStream> AwWebResourceResponse::GetInputStream(
     JNIEnv* env) const {
   ScopedJavaLocalRef<jobject> jstream =
       Java_AwWebResourceResponse_getData(env, java_object_);
   if (jstream.is_null())
     return std::unique_ptr<InputStream>();
-  return base::MakeUnique<InputStreamImpl>(jstream);
+  return base::MakeUnique<InputStream>(jstream);
 }
 
-bool AwWebResourceResponseImpl::GetMimeType(JNIEnv* env,
-                                            std::string* mime_type) const {
+bool AwWebResourceResponse::GetMimeType(JNIEnv* env,
+                                        std::string* mime_type) const {
   ScopedJavaLocalRef<jstring> jstring_mime_type =
       Java_AwWebResourceResponse_getMimeType(env, java_object_);
   if (jstring_mime_type.is_null())
     return false;
   *mime_type = ConvertJavaStringToUTF8(jstring_mime_type);
   return true;
 }
 
-bool AwWebResourceResponseImpl::GetCharset(JNIEnv* env,
-                                           std::string* charset) const {
+bool AwWebResourceResponse::GetCharset(JNIEnv* env,
+                                       std::string* charset) const {
   ScopedJavaLocalRef<jstring> jstring_charset =
       Java_AwWebResourceResponse_getCharset(env, java_object_);
   if (jstring_charset.is_null())
     return false;
   *charset = ConvertJavaStringToUTF8(jstring_charset);
   return true;
 }
 
-bool AwWebResourceResponseImpl::GetStatusInfo(
-    JNIEnv* env,
-    int* status_code,
-    std::string* reason_phrase) const {
+bool AwWebResourceResponse::GetStatusInfo(JNIEnv* env,
+                                          int* status_code,
+                                          std::string* reason_phrase) const {
   int status = Java_AwWebResourceResponse_getStatusCode(env, java_object_);
   ScopedJavaLocalRef<jstring> jstring_reason_phrase =
       Java_AwWebResourceResponse_getReasonPhrase(env, java_object_);
   if (status < 100 || status >= 600 || jstring_reason_phrase.is_null())
     return false;
   *status_code = status;
   *reason_phrase = ConvertJavaStringToUTF8(jstring_reason_phrase);
   return true;
 }
 
-bool AwWebResourceResponseImpl::GetResponseHeaders(
+bool AwWebResourceResponse::GetResponseHeaders(
     JNIEnv* env,
     net::HttpResponseHeaders* headers) const {
   ScopedJavaLocalRef<jobjectArray> jstringArray_headerNames =
       Java_AwWebResourceResponse_getResponseHeaderNames(env, java_object_);
   ScopedJavaLocalRef<jobjectArray> jstringArray_headerValues =
       Java_AwWebResourceResponse_getResponseHeaderValues(env, java_object_);
   if (jstringArray_headerNames.is_null() || jstringArray_headerValues.is_null())
     return false;
   std::vector<std::string> header_names;
   std::vector<std::string> header_values;
   AppendJavaStringArrayToStringVector(env, jstringArray_headerNames.obj(),
                                       &header_names);
   AppendJavaStringArrayToStringVector(env, jstringArray_headerValues.obj(),
                                       &header_values);
   DCHECK_EQ(header_values.size(), header_names.size());
   for (size_t i = 0; i < header_names.size(); ++i) {
     std::string header_line(header_names[i]);
     header_line.append(": ");
     header_line.append(header_values[i]);
     headers->AddHeader(header_line);
   }
   return true;
 }
 
 }  // namespace android_webview