Convert list policy to string preference. (DefaultSearchProviderEncodings).

chrome/browser/policy/configuration_policy_pref_store_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "chrome/browser/policy/configuration_policy_pref_store.h"
 #include "chrome/browser/policy/mock_configuration_policy_provider.h"
 #include "chrome/browser/prefs/proxy_config_dictionary.h"
 #include "chrome/common/pref_names.h"
@@ skipping 537 matching lines @@
 }
 
 // Checks that for a fully defined search policy, all elements have been
 // read properly.
 TEST_F(ConfigurationPolicyPrefStoreDefaultSearchTest, FullyDefined) {
   const char* const search_url = "http://test.com/search?t={searchTerms}";
   const char* const suggest_url = "http://test.com/sugg?={searchTerms}";
   const char* const icon_url = "http://test.com/icon.jpg";
   const char* const name = "MyName";
   const char* const keyword = "MyKeyword";
-  const char* const encodings = "UTF-16;UTF-8";
+  ListValue* encodings = new ListValue();
+  encodings->Append(Value::CreateStringValue("UTF-16"));
+  encodings->Append(Value::CreateStringValue("UTF-8"));
   MockConfigurationPolicyProvider provider;
   provider.AddPolicy(kPolicyDefaultSearchProviderEnabled,
                      Value::CreateBooleanValue(true));
   provider.AddPolicy(kPolicyDefaultSearchProviderSearchURL,
                      Value::CreateStringValue(search_url));
   provider.AddPolicy(kPolicyDefaultSearchProviderName,
                      Value::CreateStringValue(name));
   provider.AddPolicy(kPolicyDefaultSearchProviderKeyword,
                      Value::CreateStringValue(keyword));
   provider.AddPolicy(kPolicyDefaultSearchProviderSuggestURL,
                      Value::CreateStringValue(suggest_url));
   provider.AddPolicy(kPolicyDefaultSearchProviderIconURL,
                      Value::CreateStringValue(icon_url));
-  provider.AddPolicy(kPolicyDefaultSearchProviderEncodings,
-                     Value::CreateStringValue(encodings));
+  provider.AddPolicy(kPolicyDefaultSearchProviderEncodings, encodings);
 
   scoped_refptr<ConfigurationPolicyPrefStore> store(
       new ConfigurationPolicyPrefStore(&provider));
 
   const Value* value = NULL;
   EXPECT_EQ(PrefStore::READ_OK,
             store->GetValue(prefs::kDefaultSearchProviderSearchURL, &value));
   EXPECT_TRUE(StringValue(search_url).Equals(value));
 
   EXPECT_EQ(PrefStore::READ_OK,
             store->GetValue(prefs::kDefaultSearchProviderName, &value));
   EXPECT_TRUE(StringValue(name).Equals(value));
 
   EXPECT_EQ(PrefStore::READ_OK,
             store->GetValue(prefs::kDefaultSearchProviderKeyword, &value));
   EXPECT_TRUE(StringValue(keyword).Equals(value));
 
   EXPECT_EQ(PrefStore::READ_OK,
             store->GetValue(prefs::kDefaultSearchProviderSuggestURL, &value));
   EXPECT_TRUE(StringValue(suggest_url).Equals(value));
 
   EXPECT_EQ(PrefStore::READ_OK,
             store->GetValue(prefs::kDefaultSearchProviderIconURL, &value));
   EXPECT_TRUE(StringValue(icon_url).Equals(value));
 
   EXPECT_EQ(PrefStore::READ_OK,
             store->GetValue(prefs::kDefaultSearchProviderEncodings, &value));
-  EXPECT_TRUE(StringValue(encodings).Equals(value));
+  EXPECT_TRUE(StringValue("UTF-16;UTF-8").Equals(value));
 }
 
 // Checks that if the default search policy is missing, that no elements of the
 // default search policy will be present.
 TEST_F(ConfigurationPolicyPrefStoreDefaultSearchTest, MissingUrl) {
   const char* const suggest_url = "http://test.com/sugg?t={searchTerms}";
   const char* const icon_url = "http://test.com/icon.jpg";
   const char* const name = "MyName";
   const char* const keyword = "MyKeyword";
-  const char* const encodings = "UTF-16;UTF-8";
+  ListValue* encodings = new ListValue();
+  encodings->Append(Value::CreateStringValue("UTF-16"));
+  encodings->Append(Value::CreateStringValue("UTF-8"));
   MockConfigurationPolicyProvider provider;
   provider.AddPolicy(kPolicyDefaultSearchProviderEnabled,
                      Value::CreateBooleanValue(true));
   provider.AddPolicy(kPolicyDefaultSearchProviderName,
                      Value::CreateStringValue(name));
   provider.AddPolicy(kPolicyDefaultSearchProviderKeyword,
                      Value::CreateStringValue(keyword));
   provider.AddPolicy(kPolicyDefaultSearchProviderSuggestURL,
                      Value::CreateStringValue(suggest_url));
   provider.AddPolicy(kPolicyDefaultSearchProviderIconURL,
                      Value::CreateStringValue(icon_url));
-  provider.AddPolicy(kPolicyDefaultSearchProviderEncodings,
-                     Value::CreateStringValue(encodings));
+  provider.AddPolicy(kPolicyDefaultSearchProviderEncodings, encodings);
 
   scoped_refptr<ConfigurationPolicyPrefStore> store(
       new ConfigurationPolicyPrefStore(&provider));
 
   EXPECT_EQ(PrefStore::READ_NO_VALUE,
             store->GetValue(prefs::kDefaultSearchProviderSearchURL, NULL));
   EXPECT_EQ(PrefStore::READ_NO_VALUE,
             store->GetValue(prefs::kDefaultSearchProviderName, NULL));
   EXPECT_EQ(PrefStore::READ_NO_VALUE,
             store->GetValue(prefs::kDefaultSearchProviderKeyword, NULL));
   EXPECT_EQ(PrefStore::READ_NO_VALUE,
             store->GetValue(prefs::kDefaultSearchProviderSuggestURL, NULL));
   EXPECT_EQ(PrefStore::READ_NO_VALUE,
             store->GetValue(prefs::kDefaultSearchProviderIconURL, NULL));
   EXPECT_EQ(PrefStore::READ_NO_VALUE,
             store->GetValue(prefs::kDefaultSearchProviderEncodings, NULL));
 }
 
 // Checks that if the default search policy is invalid, that no elements of the
 // default search policy will be present.
 TEST_F(ConfigurationPolicyPrefStoreDefaultSearchTest, Invalid) {
   const char* const bad_search_url = "http://test.com/noSearchTerms";
   const char* const suggest_url = "http://test.com/sugg?t={searchTerms}";
   const char* const icon_url = "http://test.com/icon.jpg";
   const char* const name = "MyName";
   const char* const keyword = "MyKeyword";
-  const char* const encodings = "UTF-16;UTF-8";
+  ListValue* encodings = new ListValue();
+  encodings->Append(Value::CreateStringValue("UTF-16"));
+  encodings->Append(Value::CreateStringValue("UTF-8"));
   MockConfigurationPolicyProvider provider;
   provider.AddPolicy(kPolicyDefaultSearchProviderEnabled,
                      Value::CreateBooleanValue(true));
   provider.AddPolicy(kPolicyDefaultSearchProviderSearchURL,
                      Value::CreateStringValue(bad_search_url));
   provider.AddPolicy(kPolicyDefaultSearchProviderName,
                      Value::CreateStringValue(name));
   provider.AddPolicy(kPolicyDefaultSearchProviderKeyword,
                      Value::CreateStringValue(keyword));
   provider.AddPolicy(kPolicyDefaultSearchProviderSuggestURL,
                      Value::CreateStringValue(suggest_url));
   provider.AddPolicy(kPolicyDefaultSearchProviderIconURL,
                      Value::CreateStringValue(icon_url));
-  provider.AddPolicy(kPolicyDefaultSearchProviderEncodings,
-                     Value::CreateStringValue(encodings));
+  provider.AddPolicy(kPolicyDefaultSearchProviderEncodings, encodings);
 
   scoped_refptr<ConfigurationPolicyPrefStore> store(
       new ConfigurationPolicyPrefStore(&provider));
 
   EXPECT_EQ(PrefStore::READ_NO_VALUE,
             store->GetValue(prefs::kDefaultSearchProviderSearchURL, NULL));
   EXPECT_EQ(PrefStore::READ_NO_VALUE,
             store->GetValue(prefs::kDefaultSearchProviderName, NULL));
   EXPECT_EQ(PrefStore::READ_NO_VALUE,
             store->GetValue(prefs::kDefaultSearchProviderKeyword, NULL));
@@ skipping 179 matching lines @@
 
   provider_.SetInitializationComplete(true);
   EXPECT_FALSE(store_->IsInitializationComplete());
 
   store_->OnUpdatePolicy();
   Mock::VerifyAndClearExpectations(&observer_);
   EXPECT_TRUE(store_->IsInitializationComplete());
 }
 
 }  // namespace policy