| Index: net/proxy/init_proxy_resolver_unittest.cc
|
| diff --git a/net/proxy/init_proxy_resolver_unittest.cc b/net/proxy/init_proxy_resolver_unittest.cc
|
| index 91097d0e6ea1f6ba55d8194af9545d9b84fb2cc1..b0d416d33777f482e3e18b86e2570d7bd41da3e7 100644
|
| --- a/net/proxy/init_proxy_resolver_unittest.cc
|
| +++ b/net/proxy/init_proxy_resolver_unittest.cc
|
| @@ -107,7 +107,7 @@ class RuleBasedProxyScriptFetcher : public ProxyScriptFetcher {
|
|
|
| virtual void Cancel() {}
|
|
|
| - virtual net::URLRequestContext* GetRequestContext() { return NULL; }
|
| + virtual URLRequestContext* GetRequestContext() { return NULL; }
|
|
|
| private:
|
| const Rules* rules_;
|
| @@ -187,7 +187,7 @@ TEST(InitProxyResolverTest, CustomPacSucceeds) {
|
| EXPECT_EQ(rule.text(), resolver.script_data()->utf16());
|
|
|
| // Check the NetLog was filled correctly.
|
| - net::CapturingNetLog::EntryList entries;
|
| + CapturingNetLog::EntryList entries;
|
| log.GetEntries(&entries);
|
|
|
| EXPECT_EQ(6u, entries.size());
|
| @@ -224,7 +224,7 @@ TEST(InitProxyResolverTest, CustomPacFails1) {
|
| EXPECT_EQ(NULL, resolver.script_data());
|
|
|
| // Check the NetLog was filled correctly.
|
| - net::CapturingNetLog::EntryList entries;
|
| + CapturingNetLog::EntryList entries;
|
| log.GetEntries(&entries);
|
|
|
| EXPECT_EQ(4u, entries.size());
|
| @@ -338,7 +338,7 @@ TEST(InitProxyResolverTest, AutodetectFailCustomSuccess2) {
|
| // Check the NetLog was filled correctly.
|
| // (Note that the Fetch and Set states are repeated since both WPAD and custom
|
| // PAC scripts are tried).
|
| - net::CapturingNetLog::EntryList entries;
|
| + CapturingNetLog::EntryList entries;
|
| log.GetEntries(&entries);
|
|
|
| EXPECT_EQ(11u, entries.size());
|
| @@ -453,7 +453,7 @@ TEST(InitProxyResolverTest, CustomPacFails1_WithPositiveDelay) {
|
| EXPECT_EQ(NULL, resolver.script_data());
|
|
|
| // Check the NetLog was filled correctly.
|
| - net::CapturingNetLog::EntryList entries;
|
| + CapturingNetLog::EntryList entries;
|
| log.GetEntries(&entries);
|
|
|
| EXPECT_EQ(6u, entries.size());
|
| @@ -493,7 +493,7 @@ TEST(InitProxyResolverTest, CustomPacFails1_WithNegativeDelay) {
|
| EXPECT_EQ(NULL, resolver.script_data());
|
|
|
| // Check the NetLog was filled correctly.
|
| - net::CapturingNetLog::EntryList entries;
|
| + CapturingNetLog::EntryList entries;
|
| log.GetEntries(&entries);
|
|
|
| EXPECT_EQ(4u, entries.size());
|
|
|