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

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

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 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_conf igurator.h" 5 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_conf igurator.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/test/test_simple_task_runner.h" 10 #include "base/test/test_simple_task_runner.h"
11 #include "base/values.h" 11 #include "base/values.h"
12 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_event _store.h" 12 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_event _store.h"
13 #include "net/log/capturing_net_log.h" 13 #include "net/log/test_net_log.h"
14 #include "testing/gmock/include/gmock/gmock.h" 14 #include "testing/gmock/include/gmock/gmock.h"
15 #include "testing/gtest/include/gtest/gtest.h" 15 #include "testing/gtest/include/gtest/gtest.h"
16 16
17 namespace data_reduction_proxy { 17 namespace data_reduction_proxy {
18 18
19 class DataReductionProxyConfiguratorTest : public testing::Test { 19 class DataReductionProxyConfiguratorTest : public testing::Test {
20 public: 20 public:
21 void SetUp() override { 21 void SetUp() override {
22 task_runner_ = new base::TestSimpleTaskRunner(); 22 task_runner_ = new base::TestSimpleTaskRunner();
23 net_log_.reset(new net::CapturingNetLog()); 23 net_log_.reset(new net::TestNetLog());
24 data_reduction_proxy_event_store_.reset( 24 data_reduction_proxy_event_store_.reset(
25 new data_reduction_proxy::DataReductionProxyEventStore(task_runner_)); 25 new data_reduction_proxy::DataReductionProxyEventStore(task_runner_));
26 config_.reset( 26 config_.reset(
27 new DataReductionProxyConfigurator( 27 new DataReductionProxyConfigurator(
28 task_runner_, net_log_.get(), 28 task_runner_, net_log_.get(),
29 data_reduction_proxy_event_store_.get())); 29 data_reduction_proxy_event_store_.get()));
30 } 30 }
31 31
32 void CheckProxyConfig( 32 void CheckProxyConfig(
33 const net::ProxyConfig::ProxyRules::Type& expected_rules_type, 33 const net::ProxyConfig::ProxyRules::Type& expected_rules_type,
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 213
214 ASSERT_EQ(config_->bypass_rules_.size(), 6u); 214 ASSERT_EQ(config_->bypass_rules_.size(), 6u);
215 int i = 0; 215 int i = 0;
216 for (std::vector<std::string>::iterator it = config_->bypass_rules_.begin(); 216 for (std::vector<std::string>::iterator it = config_->bypass_rules_.begin();
217 it != config_->bypass_rules_.end(); ++it) { 217 it != config_->bypass_rules_.end(); ++it) {
218 EXPECT_EQ(expected[i++], *it); 218 EXPECT_EQ(expected[i++], *it);
219 } 219 }
220 } 220 }
221 221
222 } // namespace data_reduction_proxy 222 } // namespace data_reduction_proxy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698