| 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 8af9d121ab84e1fed18c57d8a01713e7b45ad9df..ebff57cbb19b991a15288bd80689ca854a642603 100644
|
| --- a/net/proxy/proxy_script_decider_unittest.cc
|
| +++ b/net/proxy/proxy_script_decider_unittest.cc
|
| @@ -235,7 +235,7 @@ TEST(ProxyScriptDeciderTest, CustomPacFails1) {
|
| EXPECT_EQ(kFailedDownloading,
|
| decider.Start(config, base::TimeDelta(), true,
|
| callback.callback()));
|
| - EXPECT_EQ(nullptr, decider.script_data());
|
| + EXPECT_FALSE(decider.script_data());
|
|
|
| // Check the NetLog was filled correctly.
|
| TestNetLogEntry::List entries;
|
| @@ -270,7 +270,7 @@ TEST(ProxyScriptDeciderTest, CustomPacFails2) {
|
| EXPECT_EQ(kFailedParsing,
|
| decider.Start(config, base::TimeDelta(), true,
|
| callback.callback()));
|
| - EXPECT_EQ(nullptr, decider.script_data());
|
| + EXPECT_FALSE(decider.script_data());
|
| }
|
|
|
| // Fail downloading the custom PAC script, because the fetcher was NULL.
|
| @@ -286,7 +286,7 @@ TEST(ProxyScriptDeciderTest, HasNullProxyScriptFetcher) {
|
| EXPECT_EQ(ERR_UNEXPECTED,
|
| decider.Start(config, base::TimeDelta(), true,
|
| callback.callback()));
|
| - EXPECT_EQ(nullptr, decider.script_data());
|
| + EXPECT_FALSE(decider.script_data());
|
| }
|
|
|
| // Succeeds in choosing autodetect (WPAD DNS).
|
| @@ -550,7 +550,7 @@ TEST(ProxyScriptDeciderTest, AutodetectFailCustomFails1) {
|
| EXPECT_EQ(kFailedDownloading,
|
| decider.Start(config, base::TimeDelta(), true,
|
| callback.callback()));
|
| - EXPECT_EQ(nullptr, decider.script_data());
|
| + EXPECT_FALSE(decider.script_data());
|
| }
|
|
|
| // Fails at WPAD (downloading), and fails at custom PAC (parsing).
|
| @@ -571,7 +571,7 @@ TEST(ProxyScriptDeciderTest, AutodetectFailCustomFails2) {
|
| EXPECT_EQ(kFailedParsing,
|
| decider.Start(config, base::TimeDelta(), true,
|
| callback.callback()));
|
| - EXPECT_EQ(nullptr, decider.script_data());
|
| + EXPECT_FALSE(decider.script_data());
|
| }
|
|
|
| // This is a copy-paste of CustomPacFails1, with the exception that we give it
|
| @@ -595,7 +595,7 @@ TEST(ProxyScriptDeciderTest, CustomPacFails1_WithPositiveDelay) {
|
| true, callback.callback()));
|
|
|
| EXPECT_EQ(kFailedDownloading, callback.WaitForResult());
|
| - EXPECT_EQ(nullptr, decider.script_data());
|
| + EXPECT_FALSE(decider.script_data());
|
|
|
| // Check the NetLog was filled correctly.
|
| TestNetLogEntry::List entries;
|
| @@ -635,7 +635,7 @@ TEST(ProxyScriptDeciderTest, CustomPacFails1_WithNegativeDelay) {
|
| EXPECT_EQ(kFailedDownloading,
|
| decider.Start(config, base::TimeDelta::FromSeconds(-5),
|
| true, callback.callback()));
|
| - EXPECT_EQ(nullptr, decider.script_data());
|
| + EXPECT_FALSE(decider.script_data());
|
|
|
| // Check the NetLog was filled correctly.
|
| TestNetLogEntry::List entries;
|
| @@ -725,7 +725,7 @@ TEST(ProxyScriptDeciderTest, AutodetectDhcpFailParse) {
|
| // it failed downloading, not that it failed parsing.
|
| EXPECT_EQ(kFailedDownloading,
|
| decider.Start(config, base::TimeDelta(), true, callback.callback()));
|
| - EXPECT_EQ(nullptr, decider.script_data());
|
| + EXPECT_FALSE(decider.script_data());
|
|
|
| EXPECT_FALSE(decider.effective_config().has_pac_url());
|
| }
|
|
|