Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1410)

Unified Diff: android_webview/browser/aw_web_resource_response_impl.cc

Issue 2889193004: [WebView] Replace AwContentsIoThreadClient, InputStream and AwWebResourceResponse (Closed)
Patch Set: fix test crash Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: android_webview/browser/aw_web_resource_response_impl.cc
diff --git a/android_webview/browser/aw_web_resource_response_impl.cc b/android_webview/browser/aw_web_resource_response_impl.cc
deleted file mode 100644
index 238af75d6279fb2f76636d1ef66ce84ca64bb9cc..0000000000000000000000000000000000000000
--- a/android_webview/browser/aw_web_resource_response_impl.cc
+++ /dev/null
@@ -1,96 +0,0 @@
-// 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/input_stream_impl.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(
- const base::android::JavaRef<jobject>& obj)
- : java_object_(obj) {}
-
-AwWebResourceResponseImpl::~AwWebResourceResponseImpl() {}
-
-std::unique_ptr<InputStream> AwWebResourceResponseImpl::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);
-}
-
-bool AwWebResourceResponseImpl::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 {
- 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 {
- 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(
- 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

Powered by Google App Engine
This is Rietveld 408576698