| Index: net/proxy/proxy_script_decider_unittest.cc
|
| diff --git a/net/proxy/proxy_script_decider_unittest.cc b/net/proxy/proxy_script_decider_unittest.cc
|
| index 383c15975eed3da1d78a49833d884fd190fc15f8..d92dfc2615cfb288d04e0e4ea87db4303350b13e 100644
|
| --- a/net/proxy/proxy_script_decider_unittest.cc
|
| +++ b/net/proxy/proxy_script_decider_unittest.cc
|
| @@ -14,8 +14,10 @@
|
| #include "net/base/net_errors.h"
|
| #include "net/base/test_completion_callback.h"
|
| #include "net/dns/mock_host_resolver.h"
|
| +#include "net/log/captured_net_log_entry.h"
|
| #include "net/log/net_log.h"
|
| #include "net/log/net_log_unittest.h"
|
| +#include "net/log/test_net_log.h"
|
| #include "net/proxy/dhcp_proxy_script_fetcher.h"
|
| #include "net/proxy/mock_proxy_script_fetcher.h"
|
| #include "net/proxy/proxy_config.h"
|
| @@ -195,7 +197,7 @@ TEST(ProxyScriptDeciderTest, CustomPacSucceeds) {
|
| EXPECT_EQ(rule.text(), decider.script_data()->utf16());
|
|
|
| // Check the NetLog was filled correctly.
|
| - TestNetLog::CapturedEntryList entries;
|
| + CapturedNetLogEntry::List entries;
|
| log.GetEntries(&entries);
|
|
|
| EXPECT_EQ(4u, entries.size());
|
| @@ -232,7 +234,7 @@ TEST(ProxyScriptDeciderTest, CustomPacFails1) {
|
| EXPECT_EQ(NULL, decider.script_data());
|
|
|
| // Check the NetLog was filled correctly.
|
| - TestNetLog::CapturedEntryList entries;
|
| + CapturedNetLogEntry::List entries;
|
| log.GetEntries(&entries);
|
|
|
| EXPECT_EQ(4u, entries.size());
|
| @@ -492,7 +494,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).
|
| - TestNetLog::CapturedEntryList entries;
|
| + CapturedNetLogEntry::List entries;
|
| log.GetEntries(&entries);
|
|
|
| EXPECT_EQ(10u, entries.size());
|
| @@ -592,7 +594,7 @@ TEST(ProxyScriptDeciderTest, CustomPacFails1_WithPositiveDelay) {
|
| EXPECT_EQ(NULL, decider.script_data());
|
|
|
| // Check the NetLog was filled correctly.
|
| - TestNetLog::CapturedEntryList entries;
|
| + CapturedNetLogEntry::List entries;
|
| log.GetEntries(&entries);
|
|
|
| EXPECT_EQ(6u, entries.size());
|
| @@ -632,7 +634,7 @@ TEST(ProxyScriptDeciderTest, CustomPacFails1_WithNegativeDelay) {
|
| EXPECT_EQ(NULL, decider.script_data());
|
|
|
| // Check the NetLog was filled correctly.
|
| - TestNetLog::CapturedEntryList entries;
|
| + CapturedNetLogEntry::List entries;
|
| log.GetEntries(&entries);
|
|
|
| EXPECT_EQ(4u, entries.size());
|
|
|