components/data_reduction_proxy/core/browser/data_reduction_proxy_settings_unittest.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_unittest.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.cc ('k') | components/data_reduction_proxy/core/browser/data_reduction_proxy_test_utils.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.h"	5 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_sett ings.h"

6	6

7 #include <stddef.h>	7 #include <stddef.h>

8 #include <stdint.h>	8 #include <stdint.h>

9	9

10 #include "base/command_line.h"	10 #include "base/command_line.h"

11 #include "base/macros.h"	11 #include "base/macros.h"

12 #include "base/md5.h"	12 #include "base/md5.h"

13 #include "base/metrics/field_trial.h"	13 #include "base/metrics/field_trial.h"

14 #include "base/metrics/histogram_samples.h"	14 #include "base/metrics/histogram_samples.h"

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

15 #include "base/test/histogram_tester.h"	16 #include "base/test/histogram_tester.h"

16 #include "base/test/mock_entropy_provider.h"	17 #include "base/test/mock_entropy_provider.h"

17 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_comp ression_stats.h"	18 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_comp ression_stats.h"

18 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_conf ig.h"	19 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_conf ig.h"

19 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_conf ig_test_utils.h"	20 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_conf ig_test_utils.h"

20 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_conf igurator_test_utils.h"	21 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_conf igurator_test_utils.h"

21 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_sett ings_test_utils.h"	22 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_sett ings_test_utils.h"

22 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_test _utils.h"	23 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_test _utils.h"

23 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_param s.h"	24 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_param s.h"

24 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_param s_test_utils.h"	25 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_param s_test_utils.h"

25 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_pref_ names.h"	26 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_pref_ names.h"

26 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_switc hes.h"	27 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_switc hes.h"

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

28 #include "net/socket/socket_test_util.h"	28 #include "net/socket/socket_test_util.h"

29 #include "net/url_request/url_request_test_util.h"	29 #include "net/url_request/url_request_test_util.h"

30 #include "testing/gmock/include/gmock/gmock.h"	30 #include "testing/gmock/include/gmock/gmock.h"

31 #include "testing/gtest/include/gtest/gtest.h"	31 #include "testing/gtest/include/gtest/gtest.h"

32	32

33 namespace data_reduction_proxy {	33 namespace data_reduction_proxy {

34	34

35 class DataReductionProxySettingsTest	35 class DataReductionProxySettingsTest

36 : public ConcreteDataReductionProxySettingsTest<	36 : public ConcreteDataReductionProxySettingsTest<

37 DataReductionProxySettings> {	37 DataReductionProxySettings> {

(...skipping 701 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
739 SyntheticFieldTrialRegistrationCallback,	739 SyntheticFieldTrialRegistrationCallback,

740 base::Unretained(this)));	740 base::Unretained(this)));

741	741

742 net::ProxyServer origin =	742 net::ProxyServer origin =

743 test_context_->config()->test_params()->proxies_for_http().front();	743 test_context_->config()->test_params()->proxies_for_http().front();

744 EXPECT_EQ(tests[i].enable_quic, origin.is_quic()) << i;	744 EXPECT_EQ(tests[i].enable_quic, origin.is_quic()) << i;

745 }	745 }

746 }	746 }

747	747

748 } // namespace data_reduction_proxy	748 } // namespace data_reduction_proxy

OLD	NEW