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

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

Issue 1862193002: Enable QUIC for proxies only when QUIC is enabled (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed sclittle comments Created 4 years, 7 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 <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/memory/ptr_util.h" 10 #include "base/memory/ptr_util.h"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 #endif 47 #endif
48 } 48 }
49 49
50 } // namespace 50 } // namespace
51 51
52 std::unique_ptr<data_reduction_proxy::DataReductionProxyIOData> 52 std::unique_ptr<data_reduction_proxy::DataReductionProxyIOData>
53 CreateDataReductionProxyChromeIOData( 53 CreateDataReductionProxyChromeIOData(
54 net::NetLog* net_log, 54 net::NetLog* net_log,
55 PrefService* prefs, 55 PrefService* prefs,
56 const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner, 56 const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner,
57 const scoped_refptr<base::SingleThreadTaskRunner>& ui_task_runner, 57 const scoped_refptr<base::SingleThreadTaskRunner>& ui_task_runner) {
58 bool enable_quic) {
59 DCHECK(net_log); 58 DCHECK(net_log);
60 DCHECK(prefs); 59 DCHECK(prefs);
61 60
62 int flags = DataReductionProxyParams::kAllowed | 61 int flags = DataReductionProxyParams::kAllowed |
63 DataReductionProxyParams::kFallbackAllowed; 62 DataReductionProxyParams::kFallbackAllowed;
64 if (data_reduction_proxy::params::IsIncludedInPromoFieldTrial()) 63 if (data_reduction_proxy::params::IsIncludedInPromoFieldTrial())
65 flags |= DataReductionProxyParams::kPromoAllowed; 64 flags |= DataReductionProxyParams::kPromoAllowed;
66 if (data_reduction_proxy::params::IsIncludedInHoldbackFieldTrial()) 65 if (data_reduction_proxy::params::IsIncludedInHoldbackFieldTrial())
67 flags |= DataReductionProxyParams::kHoldback; 66 flags |= DataReductionProxyParams::kHoldback;
68 #if defined(OS_ANDROID) 67 #if defined(OS_ANDROID)
69 if (data_reduction_proxy::params::IsIncludedInAndroidOnePromoFieldTrial( 68 if (data_reduction_proxy::params::IsIncludedInAndroidOnePromoFieldTrial(
70 base::android::BuildInfo::GetInstance()->android_build_fp())) { 69 base::android::BuildInfo::GetInstance()->android_build_fp())) {
71 flags |= DataReductionProxyParams::kPromoAllowed; 70 flags |= DataReductionProxyParams::kPromoAllowed;
72 } 71 }
73 #endif 72 #endif
74 73
75 bool enabled = 74 bool enabled =
76 prefs->GetBoolean(prefs::kDataSaverEnabled) || 75 prefs->GetBoolean(prefs::kDataSaverEnabled) ||
77 data_reduction_proxy::params::ShouldForceEnableDataReductionProxy(); 76 data_reduction_proxy::params::ShouldForceEnableDataReductionProxy();
78 std::unique_ptr<data_reduction_proxy::DataReductionProxyIOData> 77 std::unique_ptr<data_reduction_proxy::DataReductionProxyIOData>
79 data_reduction_proxy_io_data( 78 data_reduction_proxy_io_data(
80 new data_reduction_proxy::DataReductionProxyIOData( 79 new data_reduction_proxy::DataReductionProxyIOData(
81 DataReductionProxyChromeSettings::GetClient(), flags, net_log, 80 DataReductionProxyChromeSettings::GetClient(), flags, net_log,
82 io_task_runner, ui_task_runner, enabled, enable_quic, 81 io_task_runner, ui_task_runner, enabled, GetUserAgent()));
83 GetUserAgent()));
84 82
85 data_reduction_proxy_io_data->set_lofi_decider( 83 data_reduction_proxy_io_data->set_lofi_decider(
86 base::WrapUnique(new data_reduction_proxy::ContentLoFiDecider())); 84 base::WrapUnique(new data_reduction_proxy::ContentLoFiDecider()));
87 data_reduction_proxy_io_data->set_lofi_ui_service( 85 data_reduction_proxy_io_data->set_lofi_ui_service(
88 base::WrapUnique(new data_reduction_proxy::ContentLoFiUIService( 86 base::WrapUnique(new data_reduction_proxy::ContentLoFiUIService(
89 ui_task_runner, base::Bind(&OnLoFiResponseReceivedOnUI)))); 87 ui_task_runner, base::Bind(&OnLoFiResponseReceivedOnUI))));
90 88
91 return data_reduction_proxy_io_data; 89 return data_reduction_proxy_io_data;
92 } 90 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698