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

Unified Diff: android_webview/browser/net/aw_url_request_context_getter.h

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
Index: android_webview/browser/net/aw_url_request_context_getter.h
diff --git a/android_webview/browser/net/aw_url_request_context_getter.h b/android_webview/browser/net/aw_url_request_context_getter.h
index 023449e9d2e3b04522eda023c4317a746ea9ce43..64ac984d38c96ce584f6638f9911ae1494b33fb0 100644
--- a/android_webview/browser/net/aw_url_request_context_getter.h
+++ b/android_webview/browser/net/aw_url_request_context_getter.h
@@ -5,10 +5,11 @@
#ifndef ANDROID_WEBVIEW_BROWSER_NET_AW_URL_REQUEST_CONTEXT_GETTER_H_
#define ANDROID_WEBVIEW_BROWSER_NET_AW_URL_REQUEST_CONTEXT_GETTER_H_
+#include <memory>
+
#include "base/compiler_specific.h"
#include "base/files/file_path.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "components/prefs/pref_member.h"
#include "content/public/browser/content_browser_client.h"
#include "net/url_request/url_request_context_getter.h"
@@ -35,7 +36,7 @@ class AwURLRequestContextGetter : public net::URLRequestContextGetter {
public:
AwURLRequestContextGetter(
const base::FilePath& cache_path,
- scoped_ptr<net::ProxyConfigService> config_service,
+ std::unique_ptr<net::ProxyConfigService> config_service,
PrefService* pref_service);
// net::URLRequestContextGetter implementation.
@@ -69,7 +70,7 @@ class AwURLRequestContextGetter : public net::URLRequestContextGetter {
// This is called to create a HttpAuthHandlerFactory that will handle
// auth challenges for the new URLRequestContext
- scoped_ptr<net::HttpAuthHandlerFactory> CreateAuthHandlerFactory(
+ std::unique_ptr<net::HttpAuthHandlerFactory> CreateAuthHandlerFactory(
net::HostResolver* resolver);
// Update methods for the auth related preferences
@@ -78,14 +79,14 @@ class AwURLRequestContextGetter : public net::URLRequestContextGetter {
const base::FilePath cache_path_;
- scoped_ptr<net::NetLog> net_log_;
- scoped_ptr<net::ProxyConfigService> proxy_config_service_;
- scoped_ptr<net::URLRequestJobFactory> job_factory_;
- scoped_ptr<net::HttpUserAgentSettings> http_user_agent_settings_;
+ std::unique_ptr<net::NetLog> net_log_;
+ std::unique_ptr<net::ProxyConfigService> proxy_config_service_;
+ std::unique_ptr<net::URLRequestJobFactory> job_factory_;
+ std::unique_ptr<net::HttpUserAgentSettings> http_user_agent_settings_;
// http_auth_preferences_ holds the preferences for the negotiate
// authenticator.
- scoped_ptr<net::HttpAuthPreferences> http_auth_preferences_;
- scoped_ptr<net::URLRequestContext> url_request_context_;
+ std::unique_ptr<net::HttpAuthPreferences> http_auth_preferences_;
+ std::unique_ptr<net::URLRequestContext> url_request_context_;
// Store HTTP Auth-related policies in this thread.
StringPrefMember auth_android_negotiate_account_type_;
« no previous file with comments | « android_webview/browser/net/aw_request_interceptor.cc ('k') | android_webview/browser/net/aw_url_request_context_getter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698