Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(186)

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

Issue 1084533002: Rename NetLogLogger and CapturingNetLog (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rename NetLogLogger and CapturingNetLog(removed compiler error for chromeOS) Created 5 years, 8 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
OLDNEW
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_CORE_BROWSER_DATA_REDUCTION_PROXY_SETTIN GS_TEST_UTILS_H_ 5 #ifndef COMPONENTS_DATA_REDUCTION_PROXY_CORE_BROWSER_DATA_REDUCTION_PROXY_SETTIN GS_TEST_UTILS_H_
6 #define COMPONENTS_DATA_REDUCTION_PROXY_CORE_BROWSER_DATA_REDUCTION_PROXY_SETTIN GS_TEST_UTILS_H_ 6 #define COMPONENTS_DATA_REDUCTION_PROXY_CORE_BROWSER_DATA_REDUCTION_PROXY_SETTIN GS_TEST_UTILS_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 10
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "base/prefs/testing_pref_service.h" 12 #include "base/prefs/testing_pref_service.h"
13 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_sett ings.h" 13 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_sett ings.h"
14 #include "net/base/net_util.h" 14 #include "net/base/net_util.h"
15 #include "net/log/capturing_net_log.h" 15 #include "net/log/test_net_log.h"
16 #include "net/url_request/test_url_fetcher_factory.h" 16 #include "net/url_request/test_url_fetcher_factory.h"
17 #include "net/url_request/url_request_test_util.h" 17 #include "net/url_request/url_request_test_util.h"
18 #include "testing/gmock/include/gmock/gmock.h" 18 #include "testing/gmock/include/gmock/gmock.h"
19 #include "testing/gtest/include/gtest/gtest.h" 19 #include "testing/gtest/include/gtest/gtest.h"
20 20
21 class PrefService; 21 class PrefService;
22 class TestingPrefServiceSimple; 22 class TestingPrefServiceSimple;
23 23
24 namespace data_reduction_proxy { 24 namespace data_reduction_proxy {
25 25
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 bool promo_allowed, 104 bool promo_allowed,
105 bool holdback) override { 105 bool holdback) override {
106 return DataReductionProxySettingsTestBase::ResetSettings<C>( 106 return DataReductionProxySettingsTestBase::ResetSettings<C>(
107 allowed, fallback_allowed, alt_allowed, promo_allowed, holdback); 107 allowed, fallback_allowed, alt_allowed, promo_allowed, holdback);
108 } 108 }
109 }; 109 };
110 110
111 } // namespace data_reduction_proxy 111 } // namespace data_reduction_proxy
112 112
113 #endif // COMPONENTS_DATA_REDUCTION_PROXY_CORE_BROWSER_DATA_REDUCTION_PROXY_SET TINGS_TEST_UTILS_H_ 113 #endif // COMPONENTS_DATA_REDUCTION_PROXY_CORE_BROWSER_DATA_REDUCTION_PROXY_SET TINGS_TEST_UTILS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698