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 "components/data_reduction_proxy/core/browser/data_reduction_proxy_sett
ings_test_utils.h" | 5 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_sett
ings_test_utils.h" |
6 | 6 |
7 #include <stdint.h> | 7 #include <stdint.h> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
117 } | 117 } |
118 | 118 |
119 void DataReductionProxySettingsTestBase::CheckOnPrefChange( | 119 void DataReductionProxySettingsTestBase::CheckOnPrefChange( |
120 bool enabled, | 120 bool enabled, |
121 bool expected_enabled, | 121 bool expected_enabled, |
122 bool managed) { | 122 bool managed) { |
123 ExpectSetProxyPrefs(expected_enabled, false); | 123 ExpectSetProxyPrefs(expected_enabled, false); |
124 if (managed) { | 124 if (managed) { |
125 test_context_->pref_service()->SetManagedPref( | 125 test_context_->pref_service()->SetManagedPref( |
126 test_context_->GetDataReductionProxyEnabledPrefName(), | 126 test_context_->GetDataReductionProxyEnabledPrefName(), |
127 new base::FundamentalValue(enabled)); | 127 new base::Value(enabled)); |
128 } else { | 128 } else { |
129 test_context_->SetDataReductionProxyEnabled(enabled); | 129 test_context_->SetDataReductionProxyEnabled(enabled); |
130 } | 130 } |
131 test_context_->RunUntilIdle(); | 131 test_context_->RunUntilIdle(); |
132 // Never expect the proxy to be restricted for pref change tests. | 132 // Never expect the proxy to be restricted for pref change tests. |
133 } | 133 } |
134 | 134 |
135 void DataReductionProxySettingsTestBase::InitDataReductionProxy( | 135 void DataReductionProxySettingsTestBase::InitDataReductionProxy( |
136 bool enabled_at_startup) { | 136 bool enabled_at_startup) { |
137 settings_->InitDataReductionProxySettings( | 137 settings_->InitDataReductionProxySettings( |
(...skipping 10 matching lines...) Expand all Loading... |
148 test_context_->RunUntilIdle(); | 148 test_context_->RunUntilIdle(); |
149 } | 149 } |
150 | 150 |
151 void DataReductionProxySettingsTestBase::CheckDataReductionProxySyntheticTrial( | 151 void DataReductionProxySettingsTestBase::CheckDataReductionProxySyntheticTrial( |
152 bool enabled) { | 152 bool enabled) { |
153 EXPECT_EQ(enabled ? "Enabled" : "Disabled", | 153 EXPECT_EQ(enabled ? "Enabled" : "Disabled", |
154 synthetic_field_trials_["SyntheticDataReductionProxySetting"]); | 154 synthetic_field_trials_["SyntheticDataReductionProxySetting"]); |
155 } | 155 } |
156 | 156 |
157 } // namespace data_reduction_proxy | 157 } // namespace data_reduction_proxy |
OLD | NEW |