| OLD | NEW |
| 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 #include "net/url_request/url_request_context_getter.h" |
| 10 | 11 |
| 11 #if defined(OS_ANDROID) | 12 #if defined(OS_ANDROID) |
| 12 #include "base/android/build_info.h" | 13 #include "base/android/build_info.h" |
| 13 #endif | 14 #endif |
| 14 | 15 |
| 15 #if defined(ENABLE_DATA_REDUCTION_PROXY_DEBUGGING) | 16 #if defined(ENABLE_DATA_REDUCTION_PROXY_DEBUGGING) |
| 16 #include "chrome/browser/browser_process.h" | 17 #include "chrome/browser/browser_process.h" |
| 17 #include "components/data_reduction_proxy/content/browser/content_data_reduction
_proxy_debug_ui_service.h" | 18 #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" | 19 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_conf
igurator.h" |
| 19 #endif | 20 #endif |
| 20 | 21 |
| 21 namespace content { | 22 namespace content { |
| 22 class BrowserContext; | 23 class BrowserContext; |
| 23 } | 24 } |
| 24 | 25 |
| 25 using data_reduction_proxy::DataReductionProxyParams; | 26 using data_reduction_proxy::DataReductionProxyParams; |
| 26 | 27 |
| 27 scoped_ptr<data_reduction_proxy::DataReductionProxyIOData> | 28 scoped_ptr<data_reduction_proxy::DataReductionProxyIOData> |
| 28 CreateDataReductionProxyChromeIOData( | 29 CreateDataReductionProxyChromeIOData( |
| 30 net::URLRequestContextGetter* request_context_getter, |
| 29 net::NetLog* net_log, | 31 net::NetLog* net_log, |
| 30 PrefService* prefs, | 32 PrefService* prefs, |
| 31 const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner, | 33 const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner, |
| 32 const scoped_refptr<base::SingleThreadTaskRunner>& ui_task_runner, | 34 const scoped_refptr<base::SingleThreadTaskRunner>& ui_task_runner, |
| 33 bool enable_quic) { | 35 bool enable_quic) { |
| 34 DCHECK(net_log); | 36 DCHECK(net_log); |
| 35 DCHECK(prefs); | 37 DCHECK(prefs); |
| 36 | 38 |
| 37 int flags = DataReductionProxyParams::kAllowed | | 39 int flags = DataReductionProxyParams::kAllowed | |
| 38 DataReductionProxyParams::kFallbackAllowed | | 40 DataReductionProxyParams::kFallbackAllowed | |
| 39 DataReductionProxyParams::kAlternativeAllowed; | 41 DataReductionProxyParams::kAlternativeAllowed; |
| 40 if (DataReductionProxyParams::IsIncludedInPromoFieldTrial()) | 42 if (DataReductionProxyParams::IsIncludedInPromoFieldTrial()) |
| 41 flags |= DataReductionProxyParams::kPromoAllowed; | 43 flags |= DataReductionProxyParams::kPromoAllowed; |
| 42 if (DataReductionProxyParams::IsIncludedInHoldbackFieldTrial()) | 44 if (DataReductionProxyParams::IsIncludedInHoldbackFieldTrial()) |
| 43 flags |= DataReductionProxyParams::kHoldback; | 45 flags |= DataReductionProxyParams::kHoldback; |
| 44 #if defined(OS_ANDROID) | 46 #if defined(OS_ANDROID) |
| 45 if (DataReductionProxyParams::IsIncludedInAndroidOnePromoFieldTrial( | 47 if (DataReductionProxyParams::IsIncludedInAndroidOnePromoFieldTrial( |
| 46 base::android::BuildInfo::GetInstance()->android_build_fp())) { | 48 base::android::BuildInfo::GetInstance()->android_build_fp())) { |
| 47 flags |= DataReductionProxyParams::kPromoAllowed; | 49 flags |= DataReductionProxyParams::kPromoAllowed; |
| 48 } | 50 } |
| 49 #endif | 51 #endif |
| 50 | 52 |
| 51 scoped_ptr<data_reduction_proxy::DataReductionProxyIOData> | 53 scoped_ptr<data_reduction_proxy::DataReductionProxyIOData> |
| 52 data_reduction_proxy_io_data( | 54 data_reduction_proxy_io_data( |
| 53 new data_reduction_proxy::DataReductionProxyIOData( | 55 new data_reduction_proxy::DataReductionProxyIOData( |
| 54 DataReductionProxyChromeSettings::GetClient(), flags, net_log, | 56 DataReductionProxyChromeSettings::GetClient(), flags, net_log, |
| 55 io_task_runner, ui_task_runner, enable_quic)); | 57 request_context_getter, io_task_runner, ui_task_runner, |
| 58 enable_quic)); |
| 56 data_reduction_proxy_io_data->InitOnUIThread(prefs); | 59 data_reduction_proxy_io_data->InitOnUIThread(prefs); |
| 57 | 60 |
| 58 #if defined(ENABLE_DATA_REDUCTION_PROXY_DEBUGGING) | 61 #if defined(ENABLE_DATA_REDUCTION_PROXY_DEBUGGING) |
| 59 scoped_ptr<data_reduction_proxy::ContentDataReductionProxyDebugUIService> | 62 scoped_ptr<data_reduction_proxy::ContentDataReductionProxyDebugUIService> |
| 60 data_reduction_proxy_ui_service( | 63 data_reduction_proxy_ui_service( |
| 61 new data_reduction_proxy::ContentDataReductionProxyDebugUIService( | 64 new data_reduction_proxy::ContentDataReductionProxyDebugUIService( |
| 62 base::Bind(&data_reduction_proxy::DataReductionProxyConfigurator:: | 65 base::Bind(&data_reduction_proxy::DataReductionProxyConfigurator:: |
| 63 GetProxyConfigOnIOThread, | 66 GetProxyConfigOnIOThread, |
| 64 base::Unretained( | 67 base::Unretained( |
| 65 data_reduction_proxy_io_data->configurator())), | 68 data_reduction_proxy_io_data->configurator())), |
| 66 ui_task_runner, io_task_runner, | 69 ui_task_runner, io_task_runner, |
| 67 g_browser_process->GetApplicationLocale())); | 70 g_browser_process->GetApplicationLocale())); |
| 68 data_reduction_proxy_io_data->set_debug_ui_service( | 71 data_reduction_proxy_io_data->set_debug_ui_service( |
| 69 data_reduction_proxy_ui_service.Pass()); | 72 data_reduction_proxy_ui_service.Pass()); |
| 70 #endif | 73 #endif |
| 71 | 74 |
| 72 return data_reduction_proxy_io_data.Pass(); | 75 return data_reduction_proxy_io_data.Pass(); |
| 73 } | 76 } |
| OLD | NEW |