summaryrefslogtreecommitdiffstats
path: root/net/proxy/proxy_script_decider_unittest.cc
diff options
context:
space:
mode:
authorvishal.b <vishal.b@samsung.com>2015-04-17 01:45:51 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-17 08:46:07 +0000
commit62985ca964bae26730280620d01a606eeff1d226 (patch)
tree52f6c9ad2f7b20990796d14687a5d0b79780baf7 /net/proxy/proxy_script_decider_unittest.cc
parent817cf387dbb2b63fb8c00f0f9b1535a152d88b62 (diff)
downloadchromium_src-62985ca964bae26730280620d01a606eeff1d226.zip
chromium_src-62985ca964bae26730280620d01a606eeff1d226.tar.gz
chromium_src-62985ca964bae26730280620d01a606eeff1d226.tar.bz2
Rename NetLogLogger and CapturingNetLog
Renaming two classes CapturingNetLog --> TestNetLog NetLogLogger --> WriteToFileNetLogObserver BUG=473252 TBR=jam,mmenke Review URL: https://codereview.chromium.org/1084533002 Cr-Commit-Position: refs/heads/master@{#325611}
Diffstat (limited to 'net/proxy/proxy_script_decider_unittest.cc')
-rw-r--r--net/proxy/proxy_script_decider_unittest.cc20
1 files changed, 10 insertions, 10 deletions
diff --git a/net/proxy/proxy_script_decider_unittest.cc b/net/proxy/proxy_script_decider_unittest.cc
index b30243d..383c159 100644
--- a/net/proxy/proxy_script_decider_unittest.cc
+++ b/net/proxy/proxy_script_decider_unittest.cc
@@ -188,14 +188,14 @@ TEST(ProxyScriptDeciderTest, CustomPacSucceeds) {
Rules::Rule rule = rules.AddSuccessRule("http://custom/proxy.pac");
TestCompletionCallback callback;
- CapturingNetLog log;
+ TestNetLog log;
ProxyScriptDecider decider(&fetcher, &dhcp_fetcher, &log);
EXPECT_EQ(OK, decider.Start(
config, base::TimeDelta(), true, callback.callback()));
EXPECT_EQ(rule.text(), decider.script_data()->utf16());
// Check the NetLog was filled correctly.
- CapturingNetLog::CapturedEntryList entries;
+ TestNetLog::CapturedEntryList entries;
log.GetEntries(&entries);
EXPECT_EQ(4u, entries.size());
@@ -224,7 +224,7 @@ TEST(ProxyScriptDeciderTest, CustomPacFails1) {
rules.AddFailDownloadRule("http://custom/proxy.pac");
TestCompletionCallback callback;
- CapturingNetLog log;
+ TestNetLog log;
ProxyScriptDecider decider(&fetcher, &dhcp_fetcher, &log);
EXPECT_EQ(kFailedDownloading,
decider.Start(config, base::TimeDelta(), true,
@@ -232,7 +232,7 @@ TEST(ProxyScriptDeciderTest, CustomPacFails1) {
EXPECT_EQ(NULL, decider.script_data());
// Check the NetLog was filled correctly.
- CapturingNetLog::CapturedEntryList entries;
+ TestNetLog::CapturedEntryList entries;
log.GetEntries(&entries);
EXPECT_EQ(4u, entries.size());
@@ -477,7 +477,7 @@ TEST(ProxyScriptDeciderTest, AutodetectFailCustomSuccess2) {
Rules::Rule rule = rules.AddSuccessRule("http://custom/proxy.pac");
TestCompletionCallback callback;
- CapturingNetLog log;
+ TestNetLog log;
ProxyScriptDecider decider(&fetcher, &dhcp_fetcher, &log);
EXPECT_EQ(OK, decider.Start(config, base::TimeDelta(),
@@ -492,7 +492,7 @@ TEST(ProxyScriptDeciderTest, AutodetectFailCustomSuccess2) {
// Check the NetLog was filled correctly.
// (Note that various states are repeated since both WPAD and custom
// PAC scripts are tried).
- CapturingNetLog::CapturedEntryList entries;
+ TestNetLog::CapturedEntryList entries;
log.GetEntries(&entries);
EXPECT_EQ(10u, entries.size());
@@ -582,7 +582,7 @@ TEST(ProxyScriptDeciderTest, CustomPacFails1_WithPositiveDelay) {
rules.AddFailDownloadRule("http://custom/proxy.pac");
TestCompletionCallback callback;
- CapturingNetLog log;
+ TestNetLog log;
ProxyScriptDecider decider(&fetcher, &dhcp_fetcher, &log);
EXPECT_EQ(ERR_IO_PENDING,
decider.Start(config, base::TimeDelta::FromMilliseconds(1),
@@ -592,7 +592,7 @@ TEST(ProxyScriptDeciderTest, CustomPacFails1_WithPositiveDelay) {
EXPECT_EQ(NULL, decider.script_data());
// Check the NetLog was filled correctly.
- CapturingNetLog::CapturedEntryList entries;
+ TestNetLog::CapturedEntryList entries;
log.GetEntries(&entries);
EXPECT_EQ(6u, entries.size());
@@ -624,7 +624,7 @@ TEST(ProxyScriptDeciderTest, CustomPacFails1_WithNegativeDelay) {
rules.AddFailDownloadRule("http://custom/proxy.pac");
TestCompletionCallback callback;
- CapturingNetLog log;
+ TestNetLog log;
ProxyScriptDecider decider(&fetcher, &dhcp_fetcher, &log);
EXPECT_EQ(kFailedDownloading,
decider.Start(config, base::TimeDelta::FromSeconds(-5),
@@ -632,7 +632,7 @@ TEST(ProxyScriptDeciderTest, CustomPacFails1_WithNegativeDelay) {
EXPECT_EQ(NULL, decider.script_data());
// Check the NetLog was filled correctly.
- CapturingNetLog::CapturedEntryList entries;
+ TestNetLog::CapturedEntryList entries;
log.GetEntries(&entries);
EXPECT_EQ(4u, entries.size());