OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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_settings.h" | 5 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
10 #include "base/prefs/pref_service.h" | 10 #include "base/prefs/pref_service.h" |
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
131 #else | 131 #else |
132 base::TimeDelta commit_delay = base::TimeDelta::FromMinutes(60); | 132 base::TimeDelta commit_delay = base::TimeDelta::FromMinutes(60); |
133 #endif | 133 #endif |
134 | 134 |
135 scoped_ptr<data_reduction_proxy::DataReductionProxyCompressionStats> | 135 scoped_ptr<data_reduction_proxy::DataReductionProxyCompressionStats> |
136 compression_stats = make_scoped_ptr( | 136 compression_stats = make_scoped_ptr( |
137 new data_reduction_proxy::DataReductionProxyCompressionStats( | 137 new data_reduction_proxy::DataReductionProxyCompressionStats( |
138 profile_prefs, ui_task_runner, commit_delay)); | 138 profile_prefs, ui_task_runner, commit_delay)); |
139 scoped_ptr<data_reduction_proxy::DataReductionProxyService> service = | 139 scoped_ptr<data_reduction_proxy::DataReductionProxyService> service = |
140 make_scoped_ptr(new data_reduction_proxy::DataReductionProxyService( | 140 make_scoped_ptr(new data_reduction_proxy::DataReductionProxyService( |
141 compression_stats.Pass(), this, request_context_getter, | 141 compression_stats.Pass(), this, profile_prefs, request_context_getter, |
142 io_data->io_task_runner())); | 142 io_data->io_task_runner())); |
143 data_reduction_proxy::DataReductionProxySettings:: | 143 data_reduction_proxy::DataReductionProxySettings:: |
144 InitDataReductionProxySettings(profile_prefs, io_data, service.Pass()); | 144 InitDataReductionProxySettings(profile_prefs, io_data, service.Pass()); |
145 io_data->SetDataReductionProxyService( | 145 io_data->SetDataReductionProxyService( |
146 data_reduction_proxy_service()->GetWeakPtr()); | 146 data_reduction_proxy_service()->GetWeakPtr()); |
147 | 147 |
148 data_reduction_proxy::DataReductionProxySettings:: | 148 data_reduction_proxy::DataReductionProxySettings:: |
149 SetCallbackToRegisterSyntheticFieldTrial( | 149 SetCallbackToRegisterSyntheticFieldTrial( |
150 base::Bind( | 150 base::Bind( |
151 &ChromeMetricsServiceAccessor::RegisterSyntheticFieldTrial)); | 151 &ChromeMetricsServiceAccessor::RegisterSyntheticFieldTrial)); |
(...skipping 23 matching lines...) Expand all Loading... |
175 #elif defined(OS_OPENBSD) | 175 #elif defined(OS_OPENBSD) |
176 return data_reduction_proxy::Client::CHROME_OPENBSD; | 176 return data_reduction_proxy::Client::CHROME_OPENBSD; |
177 #elif defined(OS_SOLARIS) | 177 #elif defined(OS_SOLARIS) |
178 return data_reduction_proxy::Client::CHROME_SOLARIS; | 178 return data_reduction_proxy::Client::CHROME_SOLARIS; |
179 #elif defined(OS_QNX) | 179 #elif defined(OS_QNX) |
180 return data_reduction_proxy::Client::CHROME_QNX; | 180 return data_reduction_proxy::Client::CHROME_QNX; |
181 #else | 181 #else |
182 return data_reduction_proxy::Client::UNKNOWN; | 182 return data_reduction_proxy::Client::UNKNOWN; |
183 #endif | 183 #endif |
184 } | 184 } |
OLD | NEW |