chrome/service/net/service_url_request_context_getter.h - Issue 1899083002: Convert //chrome from scoped_ptr to std::unique_ptr

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/service/net/service_url_request_context_getter.h

Issue 1899083002: Convert //chrome from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 8 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

« chrome/service/cloud_print/cloud_print_auth.h ('K') | « chrome/service/cloud_print/printer_job_queue_handler_unittest.cc ('k') | chrome/service/service_ipc_server.h » ('j') | chrome/service/service_process_prefs.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/service/net/service_url_request_context_getter.h

diff --git a/chrome/service/net/service_url_request_context_getter.h b/chrome/service/net/service_url_request_context_getter.h

index caf439c8834ac6aff453b886ca60c0e97846e8e9..c091ed3b610875469ce48c1f1a783383108e513a 100644

--- a/chrome/service/net/service_url_request_context_getter.h

+++ b/chrome/service/net/service_url_request_context_getter.h

@@ -5,9 +5,9 @@

#ifndef CHROME_SERVICE_NET_SERVICE_URL_REQUEST_CONTEXT_GETTER_H_

#define CHROME_SERVICE_NET_SERVICE_URL_REQUEST_CONTEXT_GETTER_H_

+#include <memory>

#include <string>

-#include "base/memory/scoped_ptr.h"

#include "net/cookies/cookie_monster.h"

#include "net/disk_cache/disk_cache.h"

#include "net/dns/host_resolver.h"

@@ -48,8 +48,8 @@ class ServiceURLRequestContextGetter : public net::URLRequestContextGetter {

std::string user_agent_;

scoped_refptr<base::SingleThreadTaskRunner> network_task_runner_;

- scoped_ptr<net::ProxyConfigService> proxy_config_service_;

- scoped_ptr<net::URLRequestContext> url_request_context_;

+ std::unique_ptr<net::ProxyConfigService> proxy_config_service_;

+ std::unique_ptr<net::URLRequestContext> url_request_context_;

};

#endif // CHROME_SERVICE_NET_SERVICE_URL_REQUEST_CONTEXT_GETTER_H_