components/data_reduction_proxy/core/browser/data_reduction_proxy_settings_test_utils.cc - Issue 1662843002: Revert of Delete base/prefs and update callers to use components.

Side by Side Diff: components/data_reduction_proxy/core/browser/data_reduction_proxy_settings_test_utils.cc

Issue 1662843002: Revert of Delete base/prefs and update callers to use components. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 10 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

« no previous file with comments | « components/data_reduction_proxy/core/browser/data_reduction_proxy_settings_test_utils.h ('k') | components/data_reduction_proxy/core/browser/data_reduction_proxy_settings_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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"

	11 #include "base/prefs/pref_registry_simple.h"

	12 #include "base/prefs/scoped_user_pref_update.h"

	13 #include "base/prefs/testing_pref_service.h"

11 #include "base/strings/string_number_conversions.h"	14 #include "base/strings/string_number_conversions.h"

12 #include "base/time/time.h"	15 #include "base/time/time.h"

13 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_comp ression_stats.h"	16 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_comp ression_stats.h"

14 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_conf ig_test_utils.h"	17 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_conf ig_test_utils.h"

15 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_test _utils.h"	18 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_test _utils.h"

16 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_heade rs_test_utils.h"	19 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_heade rs_test_utils.h"

17 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_param s.h"	20 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_param s.h"

18 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_pref_ names.h"	21 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_pref_ names.h"

19 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_switc hes.h"	22 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_switc hes.h"

20 #include "components/prefs/pref_registry_simple.h"

21 #include "components/prefs/scoped_user_pref_update.h"

22 #include "components/prefs/testing_pref_service.h"

23	23

24 using testing::_;	24 using testing::_;

25 using testing::AnyNumber;	25 using testing::AnyNumber;

26 using testing::Return;	26 using testing::Return;

27	27

28 namespace {	28 namespace {

29	29

30 const char kProxy[] = "proxy";	30 const char kProxy[] = "proxy";

31	31

32 } // namespace	32 } // namespace

(...skipping 125 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
158 synthetic_field_trials_["SyntheticDataReductionProxySetting"]);	158 synthetic_field_trials_["SyntheticDataReductionProxySetting"]);

159 }	159 }

160	160

161 void DataReductionProxySettingsTestBase::	161 void DataReductionProxySettingsTestBase::

162 CheckDataReductionProxyLoFiSyntheticTrial(bool enabled) {	162 CheckDataReductionProxyLoFiSyntheticTrial(bool enabled) {

163 EXPECT_EQ(enabled ? "Enabled" : "Disabled",	163 EXPECT_EQ(enabled ? "Enabled" : "Disabled",

164 synthetic_field_trials_["SyntheticDataReductionProxyLoFiSetting"]);	164 synthetic_field_trials_["SyntheticDataReductionProxyLoFiSetting"]);

165 }	165 }

166	166

167 } // namespace data_reduction_proxy	167 } // namespace data_reduction_proxy

OLD	NEW