| Index: chrome/browser/prefs/proxy_policy_unittest.cc
|
| diff --git a/chrome/browser/prefs/proxy_policy_unittest.cc b/chrome/browser/prefs/proxy_policy_unittest.cc
|
| index ec51894ca9e9a87ed8048628bb637d873b84192e..512e51410b0c54ace69bcb601dd6e309f76df2bb 100644
|
| --- a/chrome/browser/prefs/proxy_policy_unittest.cc
|
| +++ b/chrome/browser/prefs/proxy_policy_unittest.cc
|
| @@ -68,9 +68,9 @@ void assertBypassList(const ProxyConfigDictionary& dict,
|
| void assertProxyModeWithoutParams(const ProxyConfigDictionary& dict,
|
| ProxyPrefs::ProxyMode proxy_mode) {
|
| assertProxyMode(dict, proxy_mode);
|
| - assertProxyServer(dict, "");
|
| - assertPacUrl(dict, "");
|
| - assertBypassList(dict, "");
|
| + assertProxyServer(dict, std::string());
|
| + assertPacUrl(dict, std::string());
|
| + assertBypassList(dict, std::string());
|
| }
|
|
|
| } // namespace
|
| @@ -130,7 +130,7 @@ TEST_F(ProxyPolicyTest, OverridesCommandLineOptions) {
|
| ProxyConfigDictionary dict(prefs->GetDictionary(prefs::kProxy));
|
| assertProxyMode(dict, ProxyPrefs::MODE_FIXED_SERVERS);
|
| assertProxyServer(dict, "789");
|
| - assertPacUrl(dict, "");
|
| + assertPacUrl(dict, std::string());
|
| assertBypassList(dict, "123");
|
|
|
| // Try a second time time with the managed PrefStore in place, the
|
| @@ -140,7 +140,7 @@ TEST_F(ProxyPolicyTest, OverridesCommandLineOptions) {
|
| ProxyConfigDictionary dict2(prefs->GetDictionary(prefs::kProxy));
|
| assertProxyMode(dict2, ProxyPrefs::MODE_FIXED_SERVERS);
|
| assertProxyServer(dict2, "ghi");
|
| - assertPacUrl(dict2, "");
|
| + assertPacUrl(dict2, std::string());
|
| assertBypassList(dict2, "abc");
|
| }
|
|
|
| @@ -160,7 +160,7 @@ TEST_F(ProxyPolicyTest, OverridesUnrelatedCommandLineOptions) {
|
| ProxyConfigDictionary dict(prefs->GetDictionary(prefs::kProxy));
|
| assertProxyMode(dict, ProxyPrefs::MODE_FIXED_SERVERS);
|
| assertProxyServer(dict, "789");
|
| - assertPacUrl(dict, "");
|
| + assertPacUrl(dict, std::string());
|
| assertBypassList(dict, "123");
|
|
|
| // Try a second time time with the managed PrefStore in place, the
|
|
|