Index: chrome/browser/extensions/api/proxy/proxy_api_helpers_unittest.cc |
diff --git a/chrome/browser/extensions/api/proxy/proxy_api_helpers_unittest.cc b/chrome/browser/extensions/api/proxy/proxy_api_helpers_unittest.cc |
index 116f85adb545a03c1204d7c5d3091213ad5c4b92..ff3cd32647995a288dd59754f1671aff7742c576 100644 |
--- a/chrome/browser/extensions/api/proxy/proxy_api_helpers_unittest.cc |
+++ b/chrome/browser/extensions/api/proxy/proxy_api_helpers_unittest.cc |
@@ -222,41 +222,71 @@ TEST(ExtensionProxyApiHelpers, CreateProxyConfigDict) { |
std::string error; |
scoped_ptr<DictionaryValue> exp_direct(ProxyConfigDictionary::CreateDirect()); |
scoped_ptr<DictionaryValue> out_direct( |
- CreateProxyConfigDict(ProxyPrefs::MODE_DIRECT, false, "", "", "", "", |
+ CreateProxyConfigDict(ProxyPrefs::MODE_DIRECT, |
+ false, |
+ std::string(), |
+ std::string(), |
+ std::string(), |
+ std::string(), |
&error)); |
EXPECT_TRUE(Value::Equals(exp_direct.get(), out_direct.get())); |
scoped_ptr<DictionaryValue> exp_auto( |
ProxyConfigDictionary::CreateAutoDetect()); |
scoped_ptr<DictionaryValue> out_auto( |
- CreateProxyConfigDict(ProxyPrefs::MODE_AUTO_DETECT, false, "", "", "", "", |
+ CreateProxyConfigDict(ProxyPrefs::MODE_AUTO_DETECT, |
+ false, |
+ std::string(), |
+ std::string(), |
+ std::string(), |
+ std::string(), |
&error)); |
EXPECT_TRUE(Value::Equals(exp_auto.get(), out_auto.get())); |
scoped_ptr<DictionaryValue> exp_pac_url( |
ProxyConfigDictionary::CreatePacScript(kSamplePacScriptUrl, false)); |
scoped_ptr<DictionaryValue> out_pac_url( |
- CreateProxyConfigDict(ProxyPrefs::MODE_PAC_SCRIPT, false, |
- kSamplePacScriptUrl, "", "", "", &error)); |
+ CreateProxyConfigDict(ProxyPrefs::MODE_PAC_SCRIPT, |
+ false, |
+ kSamplePacScriptUrl, |
+ std::string(), |
+ std::string(), |
+ std::string(), |
+ &error)); |
EXPECT_TRUE(Value::Equals(exp_pac_url.get(), out_pac_url.get())); |
scoped_ptr<DictionaryValue> exp_pac_data( |
ProxyConfigDictionary::CreatePacScript(kSamplePacScriptAsDataUrl, false)); |
scoped_ptr<DictionaryValue> out_pac_data( |
- CreateProxyConfigDict(ProxyPrefs::MODE_PAC_SCRIPT, false, "", |
- kSamplePacScript, "", "", &error)); |
+ CreateProxyConfigDict(ProxyPrefs::MODE_PAC_SCRIPT, |
+ false, |
+ std::string(), |
+ kSamplePacScript, |
+ std::string(), |
+ std::string(), |
+ &error)); |
EXPECT_TRUE(Value::Equals(exp_pac_data.get(), out_pac_data.get())); |
scoped_ptr<DictionaryValue> exp_fixed( |
ProxyConfigDictionary::CreateFixedServers("foo:80", "localhost")); |
scoped_ptr<DictionaryValue> out_fixed( |
- CreateProxyConfigDict(ProxyPrefs::MODE_FIXED_SERVERS, false, "", "", |
- "foo:80", "localhost", &error)); |
+ CreateProxyConfigDict(ProxyPrefs::MODE_FIXED_SERVERS, |
+ false, |
+ std::string(), |
+ std::string(), |
+ "foo:80", |
+ "localhost", |
+ &error)); |
EXPECT_TRUE(Value::Equals(exp_fixed.get(), out_fixed.get())); |
scoped_ptr<DictionaryValue> exp_system(ProxyConfigDictionary::CreateSystem()); |
scoped_ptr<DictionaryValue> out_system( |
- CreateProxyConfigDict(ProxyPrefs::MODE_SYSTEM, false, "", "", "", "", |
+ CreateProxyConfigDict(ProxyPrefs::MODE_SYSTEM, |
+ false, |
+ std::string(), |
+ std::string(), |
+ std::string(), |
+ std::string(), |
&error)); |
EXPECT_TRUE(Value::Equals(exp_system.get(), out_system.get())); |