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

Unified Diff: android_webview/native/aw_web_resource_response_impl.cc

Issue 1852513003: Convert //android_webview to use std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: git is hard Created 4 years, 9 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
« no previous file with comments | « android_webview/native/aw_web_resource_response_impl.h ('k') | android_webview/native/cookie_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: android_webview/native/aw_web_resource_response_impl.cc
diff --git a/android_webview/native/aw_web_resource_response_impl.cc b/android_webview/native/aw_web_resource_response_impl.cc
index 1fe5b28e18bb1e21193c5469f56616cbfe1b8a3b..c2dabcf5939fa01161ea692761720c26dfb6ea1c 100644
--- a/android_webview/native/aw_web_resource_response_impl.cc
+++ b/android_webview/native/aw_web_resource_response_impl.cc
@@ -8,6 +8,7 @@
#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"
@@ -26,13 +27,13 @@ AwWebResourceResponseImpl::AwWebResourceResponseImpl(
AwWebResourceResponseImpl::~AwWebResourceResponseImpl() {
}
-scoped_ptr<InputStream>
-AwWebResourceResponseImpl::GetInputStream(JNIEnv* env) const {
+std::unique_ptr<InputStream> AwWebResourceResponseImpl::GetInputStream(
+ JNIEnv* env) const {
ScopedJavaLocalRef<jobject> jstream =
Java_AwWebResourceResponse_getData(env, java_object_.obj());
if (jstream.is_null())
- return scoped_ptr<InputStream>();
- return make_scoped_ptr<InputStream>(new InputStreamImpl(jstream));
+ return std::unique_ptr<InputStream>();
+ return base::WrapUnique(new InputStreamImpl(jstream));
}
bool AwWebResourceResponseImpl::GetMimeType(JNIEnv* env,
« no previous file with comments | « android_webview/native/aw_web_resource_response_impl.h ('k') | android_webview/native/cookie_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698