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

Side by Side Diff: android_webview/browser/net/aw_url_request_context_getter.h

Issue 1298253002: Remove reference counting from HttpNetworkSession. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed too much, back up a bit Created 5 years, 3 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 ANDROID_WEBVIEW_BROWSER_NET_AW_URL_REQUEST_CONTEXT_GETTER_H_ 5 #ifndef ANDROID_WEBVIEW_BROWSER_NET_AW_URL_REQUEST_CONTEXT_GETTER_H_
6 #define ANDROID_WEBVIEW_BROWSER_NET_AW_URL_REQUEST_CONTEXT_GETTER_H_ 6 #define ANDROID_WEBVIEW_BROWSER_NET_AW_URL_REQUEST_CONTEXT_GETTER_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 // AwBrowserContext::CreateRequestContext() call this method. 58 // AwBrowserContext::CreateRequestContext() call this method.
59 // This method is necessary because the passed in objects are created 59 // This method is necessary because the passed in objects are created
60 // on the UI thread while |job_factory_| must be created on the IO thread. 60 // on the UI thread while |job_factory_| must be created on the IO thread.
61 void SetHandlersAndInterceptors( 61 void SetHandlersAndInterceptors(
62 content::ProtocolHandlerMap* protocol_handlers, 62 content::ProtocolHandlerMap* protocol_handlers,
63 content::URLRequestInterceptorScopedVector request_interceptors); 63 content::URLRequestInterceptorScopedVector request_interceptors);
64 64
65 void InitializeURLRequestContext(); 65 void InitializeURLRequestContext();
66 66
67 const base::FilePath cache_path_; 67 const base::FilePath cache_path_;
68
69 scoped_ptr<net::NetLog> net_log_;
pauljensen 2015/09/02 14:32:29 I like how you've reordered this here to better ma
mmenke 2015/09/02 16:29:33 I think it makes sense, but is a bit beyond the sc
70 scoped_ptr<net::ProxyConfigService> proxy_config_service_;
71 scoped_ptr<net::HttpNetworkSession> http_network_session_;
72 scoped_ptr<net::HttpTransactionFactory> main_http_factory_;
68 scoped_refptr<net::CookieStore> cookie_store_; 73 scoped_refptr<net::CookieStore> cookie_store_;
69 scoped_ptr<net::NetLog> net_log_; 74 scoped_ptr<net::URLRequestJobFactory> job_factory_;
75 scoped_ptr<net::HttpUserAgentSettings> http_user_agent_settings_;
70 scoped_ptr<net::URLRequestContext> url_request_context_; 76 scoped_ptr<net::URLRequestContext> url_request_context_;
71 scoped_ptr<net::ProxyConfigService> proxy_config_service_;
72 scoped_ptr<net::URLRequestJobFactory> job_factory_;
73 scoped_ptr<net::HttpTransactionFactory> main_http_factory_;
74 scoped_ptr<net::HttpUserAgentSettings> http_user_agent_settings_;
75 77
76 // ProtocolHandlers and interceptors are stored here between 78 // ProtocolHandlers and interceptors are stored here between
77 // SetHandlersAndInterceptors() and the first GetURLRequestContext() call. 79 // SetHandlersAndInterceptors() and the first GetURLRequestContext() call.
78 content::ProtocolHandlerMap protocol_handlers_; 80 content::ProtocolHandlerMap protocol_handlers_;
79 content::URLRequestInterceptorScopedVector request_interceptors_; 81 content::URLRequestInterceptorScopedVector request_interceptors_;
80 82
81 DISALLOW_COPY_AND_ASSIGN(AwURLRequestContextGetter); 83 DISALLOW_COPY_AND_ASSIGN(AwURLRequestContextGetter);
82 }; 84 };
83 85
84 } // namespace android_webview 86 } // namespace android_webview
85 87
86 #endif // ANDROID_WEBVIEW_BROWSER_NET_AW_URL_REQUEST_CONTEXT_GETTER_H_ 88 #endif // ANDROID_WEBVIEW_BROWSER_NET_AW_URL_REQUEST_CONTEXT_GETTER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698