Chromium Code Reviews| 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 #ifndef COMPONENTS_DATA_REDUCTION_PROXY_BROWSER_DATA_REDUCTION_PROXY_SETTINGS_TE ST_UTILS_H_ | 5 #ifndef COMPONENTS_DATA_REDUCTION_PROXY_BROWSER_DATA_REDUCTION_PROXY_SETTINGS_TE ST_UTILS_H_ |
| 6 #define COMPONENTS_DATA_REDUCTION_PROXY_BROWSER_DATA_REDUCTION_PROXY_SETTINGS_TE ST_UTILS_H_ | 6 #define COMPONENTS_DATA_REDUCTION_PROXY_BROWSER_DATA_REDUCTION_PROXY_SETTINGS_TE ST_UTILS_H_ |
| 7 | 7 |
| 8 | 8 |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "base/prefs/testing_pref_service.h" | 10 #include "base/prefs/testing_pref_service.h" |
| (...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 156 bool expected_enabled, | 156 bool expected_enabled, |
| 157 bool expected_fallback_restricted); | 157 bool expected_fallback_restricted); |
| 158 void CheckOnPrefChange(bool enabled, bool expected_enabled, bool managed); | 158 void CheckOnPrefChange(bool enabled, bool expected_enabled, bool managed); |
| 159 void CheckInitDataReductionProxy(bool enabled_at_startup); | 159 void CheckInitDataReductionProxy(bool enabled_at_startup); |
| 160 void RegisterSyntheticFieldTrialCallback(bool proxy_enabled) { | 160 void RegisterSyntheticFieldTrialCallback(bool proxy_enabled) { |
| 161 proxy_enabled_ = proxy_enabled; | 161 proxy_enabled_ = proxy_enabled; |
| 162 } | 162 } |
| 163 | 163 |
| 164 TestingPrefServiceSimple pref_service_; | 164 TestingPrefServiceSimple pref_service_; |
| 165 scoped_ptr<DataReductionProxyConfigurator> configurator_; | 165 scoped_ptr<DataReductionProxyConfigurator> configurator_; |
| 166 DataReductionProxyStatisticsPrefs* statistics_prefs_; | |
|
bengr
2014/08/27 04:53:25
This should be a scoped_ptr<>
megjablon
2014/08/28 20:44:07
Done.
| |
| 166 scoped_ptr<DataReductionProxySettings> settings_; | 167 scoped_ptr<DataReductionProxySettings> settings_; |
| 167 scoped_ptr<TestDataReductionProxyParams> expected_params_; | 168 scoped_ptr<TestDataReductionProxyParams> expected_params_; |
| 168 base::Time last_update_time_; | 169 base::Time last_update_time_; |
| 169 bool proxy_enabled_; | 170 bool proxy_enabled_; |
| 170 }; | 171 }; |
| 171 | 172 |
| 172 // Test implementations should be subclasses of an instantiation of this | 173 // Test implementations should be subclasses of an instantiation of this |
| 173 // class parameterized for whatever DataReductionProxySettings class | 174 // class parameterized for whatever DataReductionProxySettings class |
| 174 // is being tested. | 175 // is being tested. |
| 175 template <class C> | 176 template <class C> |
| (...skipping 22 matching lines...) Expand all Loading... | |
| 198 response, | 199 response, |
| 199 result, | 200 result, |
| 200 success, | 201 success, |
| 201 expected_calls); | 202 expected_calls); |
| 202 } | 203 } |
| 203 }; | 204 }; |
| 204 | 205 |
| 205 } // namespace data_reduction_proxy | 206 } // namespace data_reduction_proxy |
| 206 | 207 |
| 207 #endif // COMPONENTS_DATA_REDUCTION_PROXY_BROWSER_DATA_REDUCTION_PROXY_SETTINGS _TEST_UTILS_H_ | 208 #endif // COMPONENTS_DATA_REDUCTION_PROXY_BROWSER_DATA_REDUCTION_PROXY_SETTINGS _TEST_UTILS_H_ |
| OLD | NEW |