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

Side by Side Diff: content/shell/browser/layout_test/layout_test_url_request_context_getter.h

Issue 1874903002: Convert //content 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_SHELL_BROWSER_LAYOUT_TEST_LAYOUT_TEST_URL_REQUEST_CONTEXT_GETTER _H_ 5 #ifndef CONTENT_SHELL_BROWSER_LAYOUT_TEST_LAYOUT_TEST_URL_REQUEST_CONTEXT_GETTER _H_
6 #define CONTENT_SHELL_BROWSER_LAYOUT_TEST_LAYOUT_TEST_URL_REQUEST_CONTEXT_GETTER _H_ 6 #define CONTENT_SHELL_BROWSER_LAYOUT_TEST_LAYOUT_TEST_URL_REQUEST_CONTEXT_GETTER _H_
7 7
8 #include <memory>
9
8 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
9 #include "base/files/file_path.h" 11 #include "base/files/file_path.h"
10 #include "base/macros.h" 12 #include "base/macros.h"
11 #include "base/memory/ref_counted.h" 13 #include "base/memory/ref_counted.h"
12 #include "base/memory/scoped_ptr.h"
13 #include "content/public/browser/content_browser_client.h" 14 #include "content/public/browser/content_browser_client.h"
14 #include "content/shell/browser/shell_url_request_context_getter.h" 15 #include "content/shell/browser/shell_url_request_context_getter.h"
15 #include "net/url_request/url_request_job_factory.h" 16 #include "net/url_request/url_request_job_factory.h"
16 17
17 namespace base { 18 namespace base {
18 class MessageLoop; 19 class MessageLoop;
19 } 20 }
20 21
21 namespace net { 22 namespace net {
22 class HostResolver; 23 class HostResolver;
(...skipping 14 matching lines...) Expand all
37 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner, 38 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner,
38 scoped_refptr<base::SingleThreadTaskRunner> file_task_runner, 39 scoped_refptr<base::SingleThreadTaskRunner> file_task_runner,
39 ProtocolHandlerMap* protocol_handlers, 40 ProtocolHandlerMap* protocol_handlers,
40 URLRequestInterceptorScopedVector request_interceptors, 41 URLRequestInterceptorScopedVector request_interceptors,
41 net::NetLog* net_log); 42 net::NetLog* net_log);
42 43
43 protected: 44 protected:
44 ~LayoutTestURLRequestContextGetter() override; 45 ~LayoutTestURLRequestContextGetter() override;
45 46
46 // ShellURLRequestContextGetter implementation. 47 // ShellURLRequestContextGetter implementation.
47 scoped_ptr<net::NetworkDelegate> CreateNetworkDelegate() override; 48 std::unique_ptr<net::NetworkDelegate> CreateNetworkDelegate() override;
48 scoped_ptr<net::ProxyConfigService> GetProxyConfigService() override; 49 std::unique_ptr<net::ProxyConfigService> GetProxyConfigService() override;
49 scoped_ptr<net::ProxyService> GetProxyService() override; 50 std::unique_ptr<net::ProxyService> GetProxyService() override;
50 51
51 private: 52 private:
52 DISALLOW_COPY_AND_ASSIGN(LayoutTestURLRequestContextGetter); 53 DISALLOW_COPY_AND_ASSIGN(LayoutTestURLRequestContextGetter);
53 }; 54 };
54 55
55 } // namespace content 56 } // namespace content
56 57
57 #endif // CONTENT_SHELL_BROWSER_LAYOUT_TEST_LAYOUT_TEST_URL_REQUEST_CONTEXT_GET TER_H_ 58 #endif // CONTENT_SHELL_BROWSER_LAYOUT_TEST_LAYOUT_TEST_URL_REQUEST_CONTEXT_GET TER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698