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

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

Issue 11440036: [Android] Fix AwSettingsTest AppCache test crashes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Comments addressed Created 8 years 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | android_webview/browser/net/aw_url_request_context_getter.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "content/public/browser/browser_thread_delegate.h" 8 #include "content/public/browser/browser_thread_delegate.h"
9 9
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 #include "net/http/http_network_session.h"
11 #include "net/url_request/url_request_context_getter.h" 12 #include "net/url_request/url_request_context_getter.h"
12 13
13 namespace content { 14 namespace content {
14 class ResourceContext; 15 class ResourceContext;
15 } 16 }
16 17
17 namespace net { 18 namespace net {
19 class HttpTransactionFactory;
18 class ProxyConfigService; 20 class ProxyConfigService;
19 class URLRequestContext; 21 class URLRequestContext;
20 class URLRequestJobFactory; 22 class URLRequestJobFactory;
21 } 23 }
22 24
23 namespace android_webview { 25 namespace android_webview {
24 26
25 class AwBrowserContext; 27 class AwBrowserContext;
26 class AwNetworkDelegate; 28 class AwNetworkDelegate;
27 29
(...skipping 11 matching lines...) Expand all
39 virtual void CleanUp() OVERRIDE {} 41 virtual void CleanUp() OVERRIDE {}
40 42
41 // net::URLRequestContextGetter implementation. 43 // net::URLRequestContextGetter implementation.
42 virtual net::URLRequestContext* GetURLRequestContext() OVERRIDE; 44 virtual net::URLRequestContext* GetURLRequestContext() OVERRIDE;
43 virtual scoped_refptr<base::SingleThreadTaskRunner> 45 virtual scoped_refptr<base::SingleThreadTaskRunner>
44 GetNetworkTaskRunner() const OVERRIDE; 46 GetNetworkTaskRunner() const OVERRIDE;
45 47
46 private: 48 private:
47 virtual ~AwURLRequestContextGetter(); 49 virtual ~AwURLRequestContextGetter();
48 50
51 void PopulateNetworkSessionParams(net::HttpNetworkSession::Params* params);
52
49 AwBrowserContext* browser_context_; // weak 53 AwBrowserContext* browser_context_; // weak
50 scoped_ptr<net::URLRequestContext> url_request_context_; 54 scoped_ptr<net::URLRequestContext> url_request_context_;
51 scoped_ptr<net::ProxyConfigService> proxy_config_service_; 55 scoped_ptr<net::ProxyConfigService> proxy_config_service_;
52 scoped_ptr<content::ResourceContext> resource_context_; 56 scoped_ptr<content::ResourceContext> resource_context_;
53 scoped_ptr<net::URLRequestJobFactory> job_factory_; 57 scoped_ptr<net::URLRequestJobFactory> job_factory_;
58 scoped_ptr<net::HttpTransactionFactory> main_http_factory_;
54 59
55 DISALLOW_COPY_AND_ASSIGN(AwURLRequestContextGetter); 60 DISALLOW_COPY_AND_ASSIGN(AwURLRequestContextGetter);
56 }; 61 };
57 62
58 } // namespace android_webview 63 } // namespace android_webview
59 64
60 #endif // ANDROID_WEBVIEW_BROWSER_NET_AW_URL_REQUEST_CONTEXT_GETTER_H_ 65 #endif // ANDROID_WEBVIEW_BROWSER_NET_AW_URL_REQUEST_CONTEXT_GETTER_H_
OLDNEW
« no previous file with comments | « no previous file | 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