| Index: chrome/browser/ui/webui/options/preferences_browsertest.cc
|
| diff --git a/chrome/browser/ui/webui/options/preferences_browsertest.cc b/chrome/browser/ui/webui/options/preferences_browsertest.cc
|
| index 2fe90a97c59a039021061d05b6fd3dcad9d69ef6..6a836c0f8f5ccc3f7685c716218aa9f377765534 100644
|
| --- a/chrome/browser/ui/webui/options/preferences_browsertest.cc
|
| +++ b/chrome/browser/ui/webui/options/preferences_browsertest.cc
|
| @@ -222,8 +222,7 @@ void PreferencesBrowserTest::VerifyPref(const base::DictionaryValue* prefs,
|
| ASSERT_TRUE(pref->GetAsDictionary(&dict));
|
| VerifyKeyValue(dict, "value", value->DeepCopy());
|
| if (!controlledBy.empty()) {
|
| - VerifyKeyValue(dict, "controlledBy",
|
| - base::Value::CreateStringValue(controlledBy));
|
| + VerifyKeyValue(dict, "controlledBy", new base::StringValue(controlledBy));
|
| } else {
|
| EXPECT_FALSE(dict->HasKey("controlledBy"));
|
| }
|
| @@ -436,14 +435,14 @@ void PreferencesBrowserTest::UseDefaultTestPrefs(bool includeListPref) {
|
| types_.push_back("String");
|
| pref_names_.push_back(prefs::kEnterpriseWebStoreName);
|
| policy_names_.push_back(policy::key::kEnterpriseWebStoreName);
|
| - non_default_values_.push_back(base::Value::CreateStringValue("Store"));
|
| + non_default_values_.push_back(new base::StringValue("Store"));
|
|
|
| // URL pref.
|
| types_.push_back("URL");
|
| pref_names_.push_back(prefs::kEnterpriseWebStoreURL);
|
| policy_names_.push_back(policy::key::kEnterpriseWebStoreURL);
|
| non_default_values_.push_back(
|
| - base::Value::CreateStringValue("http://www.google.com/"));
|
| + new base::StringValue("http://www.google.com/"));
|
|
|
| // List pref.
|
| if (includeListPref) {
|
| @@ -451,8 +450,8 @@ void PreferencesBrowserTest::UseDefaultTestPrefs(bool includeListPref) {
|
| pref_names_.push_back(prefs::kURLsToRestoreOnStartup);
|
| policy_names_.push_back(policy::key::kRestoreOnStartupURLs);
|
| base::ListValue* list = new base::ListValue;
|
| - list->Append(base::Value::CreateStringValue("http://www.google.com"));
|
| - list->Append(base::Value::CreateStringValue("http://example.com"));
|
| + list->Append(new base::StringValue("http://www.google.com"));
|
| + list->Append(new base::StringValue("http://example.com"));
|
| non_default_values_.push_back(list);
|
| }
|
|
|
| @@ -649,9 +648,8 @@ IN_PROC_BROWSER_TEST_F(PreferencesBrowserTest, ChromeOSDeviceFetchPrefs) {
|
|
|
| // String pref.
|
| pref_names_.push_back(chromeos::kReleaseChannel);
|
| - default_values_.push_back(base::Value::CreateStringValue(""));
|
| - non_default_values_.push_back(
|
| - base::Value::CreateStringValue("stable-channel"));
|
| + default_values_.push_back(new base::StringValue(""));
|
| + non_default_values_.push_back(new base::StringValue("stable-channel"));
|
| decorated_non_default_values.push_back(
|
| non_default_values_.back()->DeepCopy());
|
|
|
| @@ -659,8 +657,8 @@ IN_PROC_BROWSER_TEST_F(PreferencesBrowserTest, ChromeOSDeviceFetchPrefs) {
|
| pref_names_.push_back(chromeos::kAccountsPrefUsers);
|
| default_values_.push_back(new base::ListValue);
|
| base::ListValue* list = new base::ListValue;
|
| - list->Append(base::Value::CreateStringValue("me@google.com"));
|
| - list->Append(base::Value::CreateStringValue("you@google.com"));
|
| + list->Append(new base::StringValue("me@google.com"));
|
| + list->Append(new base::StringValue("you@google.com"));
|
| non_default_values_.push_back(list);
|
| list = new base::ListValue;
|
| base::DictionaryValue* dict = new base::DictionaryValue;
|
| @@ -709,20 +707,20 @@ IN_PROC_BROWSER_TEST_F(PreferencesBrowserTest, ChromeOSProxyFetchPrefs) {
|
|
|
| // Integer pref.
|
| pref_names_.push_back(chromeos::kProxySingleHttpPort);
|
| - default_values_.push_back(base::Value::CreateStringValue(""));
|
| + default_values_.push_back(new base::StringValue(""));
|
| non_default_values_.push_back(base::Value::CreateIntegerValue(8080));
|
|
|
| // String pref.
|
| pref_names_.push_back(chromeos::kProxySingleHttp);
|
| - default_values_.push_back(base::Value::CreateStringValue(""));
|
| - non_default_values_.push_back(base::Value::CreateStringValue("127.0.0.1"));
|
| + default_values_.push_back(new base::StringValue(""));
|
| + non_default_values_.push_back(new base::StringValue("127.0.0.1"));
|
|
|
| // List pref.
|
| pref_names_.push_back(chromeos::kProxyIgnoreList);
|
| default_values_.push_back(new base::ListValue());
|
| base::ListValue* list = new base::ListValue();
|
| - list->Append(base::Value::CreateStringValue("www.google.com"));
|
| - list->Append(base::Value::CreateStringValue("example.com"));
|
| + list->Append(new base::StringValue("www.google.com"));
|
| + list->Append(new base::StringValue("example.com"));
|
| non_default_values_.push_back(list);
|
|
|
| // Verify notifications when default values are in effect.
|
|
|