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

Side by Side Diff: chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_io_data.cc

Issue 981633002: Created new URLRequestContext for secure proxy check (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed minor bug Created 5 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_io_data.h" 5 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_io_data.h"
6 6
7 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h" 7 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h"
8 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_io_d ata.h" 8 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_io_d ata.h"
9 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_param s.h" 9 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_param s.h"
10 10
11 #if defined(OS_ANDROID) 11 #if defined(OS_ANDROID)
12 #include "base/android/build_info.h" 12 #include "base/android/build_info.h"
13 #endif 13 #endif
14 14
15 #if defined(ENABLE_DATA_REDUCTION_PROXY_DEBUGGING) 15 #if defined(ENABLE_DATA_REDUCTION_PROXY_DEBUGGING)
16 #include "chrome/browser/browser_process.h" 16 #include "chrome/browser/browser_process.h"
17 #include "components/data_reduction_proxy/content/browser/content_data_reduction _proxy_debug_ui_service.h" 17 #include "components/data_reduction_proxy/content/browser/content_data_reduction _proxy_debug_ui_service.h"
18 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_conf igurator.h" 18 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_conf igurator.h"
19 #endif 19 #endif
20 20
21 namespace content { 21 namespace content {
22 class BrowserContext; 22 class BrowserContext;
23 } 23 }
24 24
25 using data_reduction_proxy::DataReductionProxyParams; 25 using data_reduction_proxy::DataReductionProxyParams;
26 26
27 scoped_ptr<data_reduction_proxy::DataReductionProxyIOData> 27 scoped_ptr<data_reduction_proxy::DataReductionProxyIOData>
28 CreateDataReductionProxyChromeIOData( 28 CreateDataReductionProxyChromeIOData(
29 net::URLRequestContextGetter* request_context_getter,
bengr 2015/04/10 17:11:43 nit: name the variable: url_request_context_getter
tbansal1 2015/04/14 22:36:22 obsolete.
29 net::NetLog* net_log, 30 net::NetLog* net_log,
30 PrefService* prefs, 31 PrefService* prefs,
31 const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner, 32 const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner,
32 const scoped_refptr<base::SingleThreadTaskRunner>& ui_task_runner, 33 const scoped_refptr<base::SingleThreadTaskRunner>& ui_task_runner,
33 bool enable_quic) { 34 bool enable_quic) {
34 DCHECK(net_log); 35 DCHECK(net_log);
35 DCHECK(prefs); 36 DCHECK(prefs);
36 37
37 int flags = DataReductionProxyParams::kAllowed | 38 int flags = DataReductionProxyParams::kAllowed |
38 DataReductionProxyParams::kFallbackAllowed | 39 DataReductionProxyParams::kFallbackAllowed |
39 DataReductionProxyParams::kAlternativeAllowed; 40 DataReductionProxyParams::kAlternativeAllowed;
40 if (DataReductionProxyParams::IsIncludedInPromoFieldTrial()) 41 if (DataReductionProxyParams::IsIncludedInPromoFieldTrial())
41 flags |= DataReductionProxyParams::kPromoAllowed; 42 flags |= DataReductionProxyParams::kPromoAllowed;
42 if (DataReductionProxyParams::IsIncludedInHoldbackFieldTrial()) 43 if (DataReductionProxyParams::IsIncludedInHoldbackFieldTrial())
43 flags |= DataReductionProxyParams::kHoldback; 44 flags |= DataReductionProxyParams::kHoldback;
44 #if defined(OS_ANDROID) 45 #if defined(OS_ANDROID)
45 if (DataReductionProxyParams::IsIncludedInAndroidOnePromoFieldTrial( 46 if (DataReductionProxyParams::IsIncludedInAndroidOnePromoFieldTrial(
46 base::android::BuildInfo::GetInstance()->android_build_fp())) { 47 base::android::BuildInfo::GetInstance()->android_build_fp())) {
47 flags |= DataReductionProxyParams::kPromoAllowed; 48 flags |= DataReductionProxyParams::kPromoAllowed;
48 } 49 }
49 #endif 50 #endif
50 51
51 scoped_ptr<data_reduction_proxy::DataReductionProxyIOData> 52 scoped_ptr<data_reduction_proxy::DataReductionProxyIOData>
52 data_reduction_proxy_io_data( 53 data_reduction_proxy_io_data(
53 new data_reduction_proxy::DataReductionProxyIOData( 54 new data_reduction_proxy::DataReductionProxyIOData(
54 DataReductionProxyChromeSettings::GetClient(), flags, net_log, 55 DataReductionProxyChromeSettings::GetClient(), flags, net_log,
55 io_task_runner, ui_task_runner, enable_quic)); 56 request_context_getter, io_task_runner, ui_task_runner,
57 enable_quic));
56 data_reduction_proxy_io_data->InitOnUIThread(prefs); 58 data_reduction_proxy_io_data->InitOnUIThread(prefs);
57 59
58 #if defined(ENABLE_DATA_REDUCTION_PROXY_DEBUGGING) 60 #if defined(ENABLE_DATA_REDUCTION_PROXY_DEBUGGING)
59 scoped_ptr<data_reduction_proxy::ContentDataReductionProxyDebugUIService> 61 scoped_ptr<data_reduction_proxy::ContentDataReductionProxyDebugUIService>
60 data_reduction_proxy_ui_service( 62 data_reduction_proxy_ui_service(
61 new data_reduction_proxy::ContentDataReductionProxyDebugUIService( 63 new data_reduction_proxy::ContentDataReductionProxyDebugUIService(
62 base::Bind(&data_reduction_proxy::DataReductionProxyConfigurator:: 64 base::Bind(&data_reduction_proxy::DataReductionProxyConfigurator::
63 GetProxyConfigOnIOThread, 65 GetProxyConfigOnIOThread,
64 base::Unretained( 66 base::Unretained(
65 data_reduction_proxy_io_data->configurator())), 67 data_reduction_proxy_io_data->configurator())),
66 ui_task_runner, io_task_runner, 68 ui_task_runner, io_task_runner,
67 g_browser_process->GetApplicationLocale())); 69 g_browser_process->GetApplicationLocale()));
68 data_reduction_proxy_io_data->set_debug_ui_service( 70 data_reduction_proxy_io_data->set_debug_ui_service(
69 data_reduction_proxy_ui_service.Pass()); 71 data_reduction_proxy_ui_service.Pass());
70 #endif 72 #endif
71 73
72 return data_reduction_proxy_io_data.Pass(); 74 return data_reduction_proxy_io_data.Pass();
73 } 75 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698