summaryrefslogtreecommitdiffstats
path: root/net/proxy/multi_threaded_proxy_resolver_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/multi_threaded_proxy_resolver_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/multi_threaded_proxy_resolver_unittest.cc')
-rw-r--r--net/proxy/multi_threaded_proxy_resolver_unittest.cc16
1 files changed, 8 insertions, 8 deletions
diff --git a/net/proxy/multi_threaded_proxy_resolver_unittest.cc b/net/proxy/multi_threaded_proxy_resolver_unittest.cc
index 9d8d728..eb70c1df 100644
--- a/net/proxy/multi_threaded_proxy_resolver_unittest.cc
+++ b/net/proxy/multi_threaded_proxy_resolver_unittest.cc
@@ -194,7 +194,7 @@ TEST(MultiThreadedProxyResolverTest, SingleThread_Basic) {
// Start request 0.
TestCompletionCallback callback0;
- CapturingBoundNetLog log0;
+ BoundTestNetLog log0;
ProxyInfo results0;
rv = resolver.GetProxyForURL(GURL("http://request0"), &results0,
callback0.callback(), NULL, log0.bound());
@@ -209,7 +209,7 @@ TEST(MultiThreadedProxyResolverTest, SingleThread_Basic) {
// on completion, this should have been copied into |log0|.
// We also have 1 log entry that was emitted by the
// MultiThreadedProxyResolver.
- CapturingNetLog::CapturedEntryList entries0;
+ TestNetLog::CapturedEntryList entries0;
log0.GetEntries(&entries0);
ASSERT_EQ(2u, entries0.size());
@@ -275,7 +275,7 @@ TEST(MultiThreadedProxyResolverTest,
ProxyResolver::RequestHandle request0;
TestCompletionCallback callback0;
ProxyInfo results0;
- CapturingBoundNetLog log0;
+ BoundTestNetLog log0;
rv = resolver.GetProxyForURL(GURL("http://request0"), &results0,
callback0.callback(), &request0, log0.bound());
EXPECT_EQ(ERR_IO_PENDING, rv);
@@ -284,7 +284,7 @@ TEST(MultiThreadedProxyResolverTest,
TestCompletionCallback callback1;
ProxyInfo results1;
- CapturingBoundNetLog log1;
+ BoundTestNetLog log1;
rv = resolver.GetProxyForURL(GURL("http://request1"), &results1,
callback1.callback(), NULL, log1.bound());
EXPECT_EQ(ERR_IO_PENDING, rv);
@@ -292,7 +292,7 @@ TEST(MultiThreadedProxyResolverTest,
ProxyResolver::RequestHandle request2;
TestCompletionCallback callback2;
ProxyInfo results2;
- CapturingBoundNetLog log2;
+ BoundTestNetLog log2;
rv = resolver.GetProxyForURL(GURL("http://request2"), &results2,
callback2.callback(), &request2, log2.bound());
EXPECT_EQ(ERR_IO_PENDING, rv);
@@ -307,7 +307,7 @@ TEST(MultiThreadedProxyResolverTest,
EXPECT_EQ(0, callback0.WaitForResult());
EXPECT_EQ("PROXY request0:80", results0.ToPacString());
- CapturingNetLog::CapturedEntryList entries0;
+ TestNetLog::CapturedEntryList entries0;
log0.GetEntries(&entries0);
ASSERT_EQ(2u, entries0.size());
@@ -318,7 +318,7 @@ TEST(MultiThreadedProxyResolverTest,
EXPECT_EQ(1, callback1.WaitForResult());
EXPECT_EQ("PROXY request1:80", results1.ToPacString());
- CapturingNetLog::CapturedEntryList entries1;
+ TestNetLog::CapturedEntryList entries1;
log1.GetEntries(&entries1);
ASSERT_EQ(4u, entries1.size());
@@ -333,7 +333,7 @@ TEST(MultiThreadedProxyResolverTest,
EXPECT_EQ(2, callback2.WaitForResult());
EXPECT_EQ("PROXY request2:80", results2.ToPacString());
- CapturingNetLog::CapturedEntryList entries2;
+ TestNetLog::CapturedEntryList entries2;
log2.GetEntries(&entries2);
ASSERT_EQ(4u, entries2.size());