Create additional PrefStore for Device Management policy.

chrome/browser/prefs/pref_value_store_unittest.cc

 // Copyright (c) 2010 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/scoped_ptr.h"
 #include "base/values.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/policy/configuration_policy_pref_store.h"
 #include "chrome/browser/prefs/dummy_pref_store.h"
 #include "chrome/browser/prefs/pref_value_store.h"
@@ skipping 18 matching lines @@
 // Names of the preferences used in this test program.
 namespace prefs {
 const char kMissingPref[] = "this.pref.does_not_exist";
 const char kRecommendedPref[] = "this.pref.recommended_value_only";
 const char kSampleDict[] = "sample.dict";
 const char kSampleList[] = "sample.list";
 const char kDefaultPref[] = "default.pref";
 }
 
 // Potentially expected values of all preferences used in this test program.
-namespace enforced_pref {
+namespace managed_platform_pref {
 const std::string kHomepageValue = "http://www.topeka.com";
 }
 
+namespace device_management_pref {
+const std::string kSearchProviderName = "Chromium";

[Mattias Nissler (ping if slow), 2010/11/12 15:02:13]

the idea of these tests is that this one should also be present in all
lower-priority stores, but with different values.

[danno, 2010/11/12 16:17:30]

Done.

+}
+
 namespace extension_pref {
 const char kCurrentThemeIDValue[] = "set by extension";
 const char kHomepageValue[] = "http://www.chromium.org";
 }
 
 namespace command_line_pref {
 const char kApplicationLocaleValue[] = "hi-MOM";
 const char kCurrentThemeIDValue[] = "zyxwvut";
 const char kHomepageValue[] = "http://www.ferretcentral.org";
 }
@@ skipping 15 matching lines @@
 
 namespace default_pref {
 const int kDefaultValue = 7;
 const char kHomepageValue[] = "default homepage";
 }
 
 class PrefValueStoreTest : public testing::Test {
  protected:
   virtual void SetUp() {
     // Create dummy user preferences.
-    enforced_prefs_= CreateEnforcedPrefs();
+    managed_platform_prefs_= CreateManagedPlatformPrefs();
+    device_management_prefs_ = CreateDeviceManagementPrefs();
     extension_prefs_ = CreateExtensionPrefs();
     command_line_prefs_ = CreateCommandLinePrefs();
     user_prefs_ = CreateUserPrefs();
     recommended_prefs_ = CreateRecommendedPrefs();
     default_prefs_ = CreateDefaultPrefs();
 
+    std::sort(expected_differing_paths_.begin(),
+              expected_differing_paths_.end());
+
     // Create |DummyPrefStore|s.
-    enforced_pref_store_ = new DummyPrefStore();
-    enforced_pref_store_->set_prefs(enforced_prefs_);
+    managed_platform_pref_store_ = new DummyPrefStore();
+    managed_platform_pref_store_->set_prefs(managed_platform_prefs_);
+    device_management_pref_store_ = new DummyPrefStore();
+    device_management_pref_store_->set_prefs(device_management_prefs_);
     extension_pref_store_ = new DummyPrefStore();
     extension_pref_store_->set_prefs(extension_prefs_);
     command_line_pref_store_ = new DummyPrefStore();
     command_line_pref_store_->set_prefs(command_line_prefs_);
     user_pref_store_ = new DummyPrefStore();
     user_pref_store_->set_read_only(false);
     user_pref_store_->set_prefs(user_prefs_);
     recommended_pref_store_ = new DummyPrefStore();
     recommended_pref_store_->set_prefs(recommended_prefs_);
     default_pref_store_ = new DummyPrefStore();
     default_pref_store_->set_prefs(default_prefs_);
 
     // Create a new pref-value-store.
     pref_value_store_ = new TestingPrefService::TestingPrefValueStore(
-        enforced_pref_store_,
+        managed_platform_pref_store_,
+        device_management_pref_store_,
         extension_pref_store_,
         command_line_pref_store_,
         user_pref_store_,
         recommended_pref_store_,
         default_pref_store_);
 
     // Register prefs with the PrefValueStore.
     pref_value_store_->RegisterPreferenceType(prefs::kApplicationLocale,
                                               Value::TYPE_STRING);
     pref_value_store_->RegisterPreferenceType(prefs::kCurrentThemeID,
                                               Value::TYPE_STRING);
+    pref_value_store_->RegisterPreferenceType(
+        prefs::kDefaultSearchProviderName,
+        Value::TYPE_STRING);
     pref_value_store_->RegisterPreferenceType(prefs::kDeleteCache,
                                               Value::TYPE_BOOLEAN);
     pref_value_store_->RegisterPreferenceType(prefs::kHomePage,
                                               Value::TYPE_STRING);
     pref_value_store_->RegisterPreferenceType(prefs::kStabilityLaunchCount,
                                               Value::TYPE_INTEGER);
     pref_value_store_->RegisterPreferenceType(prefs::kRecommendedPref,
                                               Value::TYPE_BOOLEAN);
     pref_value_store_->RegisterPreferenceType(prefs::kSampleDict,
                                               Value::TYPE_DICTIONARY);
@@ skipping 16 matching lines @@
     user_prefs->SetInteger(prefs::kStabilityLaunchCount,
                            user_pref::kStabilityLaunchCountValue);
     user_prefs->SetString(prefs::kCurrentThemeID,
         user_pref::kCurrentThemeIDValue);
     user_prefs->SetString(prefs::kApplicationLocale,
         user_pref::kApplicationLocaleValue);
     user_prefs->SetString(prefs::kHomePage, user_pref::kHomepageValue);
     return user_prefs;
   }
 
-  DictionaryValue* CreateEnforcedPrefs() {
-    DictionaryValue* enforced_prefs = new DictionaryValue();
-    enforced_prefs->SetString(prefs::kHomePage, enforced_pref::kHomepageValue);
+  DictionaryValue* CreateManagedPlatformPrefs() {
+    DictionaryValue* managed_platform_prefs = new DictionaryValue();
+    managed_platform_prefs->SetString(
+        prefs::kHomePage,
+        managed_platform_pref::kHomepageValue);
     expected_differing_paths_.push_back(prefs::kHomePage);
-    return enforced_prefs;
+    return managed_platform_prefs;
+  }
+
+  DictionaryValue* CreateDeviceManagementPrefs() {
+    DictionaryValue* device_management_prefs = new DictionaryValue();
+    device_management_prefs->SetString(
+        prefs::kDefaultSearchProviderName,
+        device_management_pref::kSearchProviderName);
+    expected_differing_paths_.push_back("default_search_provider");
+    expected_differing_paths_.push_back(prefs::kDefaultSearchProviderName);
+    return device_management_prefs;
   }
 
   DictionaryValue* CreateExtensionPrefs() {
     DictionaryValue* extension_prefs = new DictionaryValue();
     extension_prefs->SetString(prefs::kCurrentThemeID,
         extension_pref::kCurrentThemeIDValue);
     extension_prefs->SetString(prefs::kHomePage,
         extension_pref::kHomepageValue);
     return extension_prefs;
   }
@@ skipping 53 matching lines @@
 
   virtual void TearDown() {
     loop_.RunAllPending();
   }
 
   MessageLoop loop_;
 
   scoped_refptr<TestingPrefService::TestingPrefValueStore> pref_value_store_;
 
   // |PrefStore|s are owned by the |PrefValueStore|.
-  DummyPrefStore* enforced_pref_store_;
+  DummyPrefStore* managed_platform_pref_store_;
+  DummyPrefStore* device_management_pref_store_;
   DummyPrefStore* extension_pref_store_;
   DummyPrefStore* command_line_pref_store_;
   DummyPrefStore* user_pref_store_;
   DummyPrefStore* recommended_pref_store_;
   DummyPrefStore* default_pref_store_;
 
   // A vector of the preferences paths in the managed and recommended
   // PrefStores that are set at the beginning of a test. Can be modified
   // by the test to track changes that it makes to the preferences
   // stored in the managed and recommended PrefStores.
   std::vector<std::string> expected_differing_paths_;
 
   // Preferences are owned by the individual |DummyPrefStores|.
-  DictionaryValue* enforced_prefs_;
+  DictionaryValue* managed_platform_prefs_;
+  DictionaryValue* device_management_prefs_;
   DictionaryValue* extension_prefs_;
   DictionaryValue* command_line_prefs_;
   DictionaryValue* user_prefs_;
   DictionaryValue* recommended_prefs_;
   DictionaryValue* default_prefs_;
 
  private:
   scoped_ptr<BrowserThread> ui_thread_;
   scoped_ptr<BrowserThread> file_thread_;
 };
 
 TEST_F(PrefValueStoreTest, IsReadOnly) {
-  enforced_pref_store_->set_read_only(true);
+  managed_platform_pref_store_->set_read_only(true);
   extension_pref_store_->set_read_only(true);
   command_line_pref_store_->set_read_only(true);
   user_pref_store_->set_read_only(true);
   recommended_pref_store_->set_read_only(true);
   default_pref_store_->set_read_only(true);
   EXPECT_TRUE(pref_value_store_->ReadOnly());
 
   user_pref_store_->set_read_only(false);
   EXPECT_FALSE(pref_value_store_->ReadOnly());
 }
 
 TEST_F(PrefValueStoreTest, GetValue) {
   Value* value;
 
-  // Test getting an enforced value overwriting a user-defined and
+  // Test getting a managed_platform value overwriting a user-defined and
   // extension-defined value.
   value = NULL;
   ASSERT_TRUE(pref_value_store_->GetValue(prefs::kHomePage, &value));
   std::string actual_str_value;
   EXPECT_TRUE(value->GetAsString(&actual_str_value));
-  EXPECT_EQ(enforced_pref::kHomepageValue, actual_str_value);
+  EXPECT_EQ(managed_platform_pref::kHomepageValue, actual_str_value);

[Mattias Nissler (ping if slow), 2010/11/12 15:02:13]

Here you should insert a test case that tests the cloud policy value overrides
all lower-priority values.

[danno, 2010/11/12 16:17:30]

Done.

 
   // Test getting an extension value overwriting a user-defined and
   // command-line-defined value.
   value = NULL;
   ASSERT_TRUE(pref_value_store_->GetValue(prefs::kCurrentThemeID, &value));
   EXPECT_TRUE(value->GetAsString(&actual_str_value));
   EXPECT_EQ(extension_pref::kCurrentThemeIDValue, actual_str_value);
 
   // Test getting a command-line value overwriting a user-defined value.
   value = NULL;
@@ skipping 47 matching lines @@
   Value* value = NULL;
   ASSERT_TRUE(pref_value_store_->GetValue(prefs::kStabilityLaunchCount,
                                           &value));
   ASSERT_TRUE(value != NULL);
   ASSERT_EQ(Value::TYPE_INTEGER, value->GetType());
   int actual_int_value = -1;
   EXPECT_TRUE(value->GetAsInteger(&actual_int_value));
   EXPECT_EQ(recommended_pref::kStabilityLaunchCountValue, actual_int_value);
 
   // Check falling back multiple times, to a default string.
-  enforced_pref_store_->prefs()->SetInteger(prefs::kHomePage, 1);
+  managed_platform_pref_store_->prefs()->SetInteger(prefs::kHomePage, 1);
+  device_management_pref_store_->prefs()->SetInteger(prefs::kHomePage, 1);
   extension_pref_store_->prefs()->SetInteger(prefs::kHomePage, 1);
   command_line_pref_store_->prefs()->SetInteger(prefs::kHomePage, 1);
   user_pref_store_->prefs()->SetInteger(prefs::kHomePage, 1);
   recommended_pref_store_->prefs()->SetInteger(prefs::kHomePage, 1);
   default_pref_store_->prefs()->SetString(prefs::kHomePage,
                                           default_pref::kHomepageValue);
 
   value = NULL;
   ASSERT_TRUE(pref_value_store_->GetValue(prefs::kHomePage, &value));
   ASSERT_TRUE(value != NULL);
   ASSERT_EQ(Value::TYPE_STRING, value->GetType());
   std::string actual_str_value;
   EXPECT_TRUE(value->GetAsString(&actual_str_value));
   EXPECT_EQ(default_pref::kHomepageValue, actual_str_value);
 }
 
 TEST_F(PrefValueStoreTest, HasPrefPath) {
-  // Enforced preference
+  // Managed_Platform preference
   EXPECT_TRUE(pref_value_store_->HasPrefPath(prefs::kHomePage));
+  // Device management preference
+  EXPECT_TRUE(pref_value_store_->HasPrefPath(
+      prefs::kDefaultSearchProviderName));
+  // Extension preference
+  EXPECT_TRUE(pref_value_store_->HasPrefPath(prefs::kCurrentThemeID));
   // User preference
   EXPECT_TRUE(pref_value_store_->HasPrefPath(prefs::kDeleteCache));
   // Recommended preference
   EXPECT_TRUE(pref_value_store_->HasPrefPath(prefs::kRecommendedPref));
   // Default preference
   EXPECT_FALSE(pref_value_store_->HasPrefPath(prefs::kDefaultPref));
   // Unknown preference
   EXPECT_FALSE(pref_value_store_->HasPrefPath(prefs::kMissingPref));
 }
 
 TEST_F(PrefValueStoreTest, PrefHasChanged) {
   // Setup.
-  const char managed_pref_path[] = "managed_pref";
-  pref_value_store_->RegisterPreferenceType(managed_pref_path,
+  const char managed_platform_pref_path[] = "managed_platform_pref";
+  pref_value_store_->RegisterPreferenceType(managed_platform_pref_path,
                                             Value::TYPE_STRING);
-  enforced_pref_store_->prefs()->SetString(managed_pref_path, "managed value");
+  managed_platform_pref_store_->prefs()->SetString(managed_platform_pref_path,
+                                                   "managed value");
   const char user_pref_path[] = "user_pref";
   pref_value_store_->RegisterPreferenceType(user_pref_path, Value::TYPE_STRING);
   user_pref_store_->prefs()->SetString(user_pref_path, "user value");
   const char default_pref_path[] = "default_pref";
   pref_value_store_->RegisterPreferenceType(default_pref_path,
                                             Value::TYPE_STRING);
   default_pref_store_->prefs()->SetString(default_pref_path, "default value");
 
   // Check pref controlled by highest-priority store.
-  EXPECT_TRUE(pref_value_store_->PrefHasChanged(managed_pref_path,
+  EXPECT_TRUE(pref_value_store_->PrefHasChanged(managed_platform_pref_path,
       static_cast<PrefNotifier::PrefStoreType>(0)));
-  EXPECT_FALSE(pref_value_store_->PrefHasChanged(managed_pref_path,
+  EXPECT_FALSE(pref_value_store_->PrefHasChanged(managed_platform_pref_path,
       PrefNotifier::USER_STORE));
 
   // Check pref controlled by user store.
   EXPECT_TRUE(pref_value_store_->PrefHasChanged(user_pref_path,
       static_cast<PrefNotifier::PrefStoreType>(0)));
   EXPECT_TRUE(pref_value_store_->PrefHasChanged(user_pref_path,
       PrefNotifier::USER_STORE));
   EXPECT_FALSE(pref_value_store_->PrefHasChanged(user_pref_path,
       PrefNotifier::PREF_STORE_TYPE_MAX));
 
@@ skipping 16 matching lines @@
 TEST_F(PrefValueStoreTest, WritePrefs) {
   user_pref_store_->set_prefs_written(false);
   pref_value_store_->WritePrefs();
   ASSERT_TRUE(user_pref_store_->get_prefs_written());
 }
 
 TEST_F(PrefValueStoreTest, SetUserPrefValue) {
   Value* new_value = NULL;
   Value* actual_value = NULL;
 
-  // Test that enforced values can not be set.
-  ASSERT_TRUE(pref_value_store_->PrefValueInManagedStore(prefs::kHomePage));
+  // Test that managed_platform values can not be set.
+  ASSERT_TRUE(pref_value_store_->PrefValueInManagedPlatformStore(
+      prefs::kHomePage));
   // The Ownership is tranfered to |PrefValueStore|.
   new_value = Value::CreateStringValue("http://www.youtube.com");
   pref_value_store_->SetUserPrefValue(prefs::kHomePage, new_value);
 
   ASSERT_TRUE(pref_value_store_->GetValue(prefs::kHomePage, &actual_value));
   std::string value_str;
   actual_value->GetAsString(&value_str);
-  ASSERT_EQ(enforced_pref::kHomepageValue, value_str);
+  ASSERT_EQ(managed_platform_pref::kHomepageValue, value_str);
 
   // User preferences values can be set
-  ASSERT_FALSE(pref_value_store_->PrefValueInManagedStore(
+  ASSERT_FALSE(pref_value_store_->PrefValueInManagedPlatformStore(
       prefs::kStabilityLaunchCount));
   actual_value = NULL;
   pref_value_store_->GetValue(prefs::kStabilityLaunchCount, &actual_value);
   int int_value;
   EXPECT_TRUE(actual_value->GetAsInteger(&int_value));
   EXPECT_EQ(user_pref::kStabilityLaunchCountValue, int_value);
 
   new_value = Value::CreateIntegerValue(1);
   pref_value_store_->SetUserPrefValue(prefs::kStabilityLaunchCount, new_value);
   actual_value = NULL;
@@ skipping 16 matching lines @@
   pref_value_store_->SetUserPrefValue(prefs::kSampleList, expected_list_value);
 
   actual_value = NULL;
   key = prefs::kSampleList;
   pref_value_store_->GetValue(key, &actual_value);
 
   ASSERT_EQ(expected_list_value, actual_value);
   ASSERT_TRUE(expected_list_value->Equals(actual_value));
 }
 
-TEST_F(PrefValueStoreTest, PrefValueInManagedStore) {
-  // Test an enforced preference.
+TEST_F(PrefValueStoreTest, PrefValueInManagedPlatformStore) {
+  // Test a managed platform preference.
   ASSERT_TRUE(pref_value_store_->HasPrefPath(prefs::kHomePage));
-  EXPECT_TRUE(pref_value_store_->PrefValueInManagedStore(prefs::kHomePage));
+  EXPECT_TRUE(pref_value_store_->PrefValueInManagedPlatformStore(
+      prefs::kHomePage));
+
+  // Test a device management preference.
+  ASSERT_TRUE(pref_value_store_->HasPrefPath(
+      prefs::kDefaultSearchProviderName));
+  EXPECT_TRUE(pref_value_store_->PrefValueInDeviceManagementStore(
+      prefs::kDefaultSearchProviderName));
 
   // Test an extension preference.
   ASSERT_TRUE(pref_value_store_->HasPrefPath(prefs::kCurrentThemeID));
-  EXPECT_FALSE(pref_value_store_->PrefValueInManagedStore(
+  EXPECT_FALSE(pref_value_store_->PrefValueInManagedPlatformStore(
       prefs::kCurrentThemeID));
 
   // Test a command-line preference.
   ASSERT_TRUE(pref_value_store_->HasPrefPath(prefs::kApplicationLocale));
-  EXPECT_FALSE(pref_value_store_->PrefValueInManagedStore(
+  EXPECT_FALSE(pref_value_store_->PrefValueInManagedPlatformStore(
       prefs::kApplicationLocale));
 
   // Test a user preference.
   ASSERT_TRUE(pref_value_store_->HasPrefPath(prefs::kStabilityLaunchCount));
-  EXPECT_FALSE(pref_value_store_->PrefValueInManagedStore(
+  EXPECT_FALSE(pref_value_store_->PrefValueInManagedPlatformStore(
       prefs::kStabilityLaunchCount));
 
   // Test a preference from the recommended pref store.
   ASSERT_TRUE(pref_value_store_->HasPrefPath(prefs::kRecommendedPref));
-  EXPECT_FALSE(pref_value_store_->PrefValueInManagedStore(
+  EXPECT_FALSE(pref_value_store_->PrefValueInManagedPlatformStore(
       prefs::kRecommendedPref));
 
   // Test a preference from the default pref store.
   ASSERT_FALSE(pref_value_store_->HasPrefPath(prefs::kDefaultPref));
-  EXPECT_FALSE(pref_value_store_->PrefValueInManagedStore(
+  EXPECT_FALSE(pref_value_store_->PrefValueInManagedPlatformStore(
       prefs::kDefaultPref));
 
   // Test a preference for which the PrefValueStore does not contain a value.
   ASSERT_FALSE(pref_value_store_->HasPrefPath(prefs::kMissingPref));
-  EXPECT_FALSE(pref_value_store_->PrefValueInManagedStore(prefs::kMissingPref));
+  EXPECT_FALSE(pref_value_store_->PrefValueInManagedPlatformStore(
+      prefs::kMissingPref));
 }
 
 TEST_F(PrefValueStoreTest, PrefValueInExtensionStore) {
-  // Test an enforced preference.
+  // Test a managed platform preference.
   ASSERT_TRUE(pref_value_store_->HasPrefPath(prefs::kHomePage));
   EXPECT_TRUE(pref_value_store_->PrefValueInExtensionStore(prefs::kHomePage));
   EXPECT_FALSE(pref_value_store_->PrefValueFromExtensionStore(
       prefs::kHomePage));
 
+  // Test a device management preference.
+  ASSERT_TRUE(pref_value_store_->HasPrefPath(
+      prefs::kDefaultSearchProviderName));
+  EXPECT_FALSE(pref_value_store_->PrefValueInExtensionStore(
+      prefs::kDefaultSearchProviderName));
+  EXPECT_FALSE(pref_value_store_->PrefValueFromExtensionStore(
+      prefs::kDefaultSearchProviderName));
+
   // Test an extension preference.
   ASSERT_TRUE(pref_value_store_->HasPrefPath(prefs::kCurrentThemeID));
   EXPECT_TRUE(pref_value_store_->PrefValueInExtensionStore(
       prefs::kCurrentThemeID));
   EXPECT_TRUE(pref_value_store_->PrefValueFromExtensionStore(
       prefs::kCurrentThemeID));
 
   // Test a command-line preference.
   ASSERT_TRUE(pref_value_store_->HasPrefPath(prefs::kApplicationLocale));
   EXPECT_FALSE(pref_value_store_->PrefValueInExtensionStore(
@@ skipping 31 matching lines @@
 }
 
 TEST_F(PrefValueStoreTest, DetectProxyConfigurationConflict) {
   // There should be no conflicting proxy prefs in the default
   // preference stores created for the test.
   ASSERT_FALSE(pref_value_store_->HasPolicyConflictingUserProxySettings());
 
   // Create conflicting proxy settings in the managed and command-line
   // preference stores.
   command_line_prefs_->SetBoolean(prefs::kProxyAutoDetect, false);
-  enforced_prefs_->SetBoolean(prefs::kProxyAutoDetect, true);
+  managed_platform_prefs_->SetBoolean(prefs::kProxyAutoDetect, true);
   ASSERT_TRUE(pref_value_store_->HasPolicyConflictingUserProxySettings());
 }
 
 TEST_F(PrefValueStoreTest, PrefValueInUserStore) {
-  // Test an enforced preference.
+  // Test a managed platform preference.
   ASSERT_TRUE(pref_value_store_->HasPrefPath(prefs::kHomePage));
   EXPECT_TRUE(pref_value_store_->PrefValueInUserStore(prefs::kHomePage));
   EXPECT_FALSE(pref_value_store_->PrefValueFromUserStore(prefs::kHomePage));
 
+  // Test a device management preference.
+  ASSERT_TRUE(pref_value_store_->HasPrefPath(
+      prefs::kDefaultSearchProviderName));
+  EXPECT_FALSE(pref_value_store_->PrefValueInExtensionStore(

[Mattias Nissler (ping if slow), 2010/11/12 15:02:13]

should be PrefValueInUserStore

[danno, 2010/11/12 16:17:30]

Done.

+      prefs::kDefaultSearchProviderName));
+  EXPECT_FALSE(pref_value_store_->PrefValueFromUserStore(
+      prefs::kDefaultSearchProviderName));
+
   // Test an extension preference.
   ASSERT_TRUE(pref_value_store_->HasPrefPath(prefs::kCurrentThemeID));
   EXPECT_TRUE(pref_value_store_->PrefValueInUserStore(
       prefs::kCurrentThemeID));
   EXPECT_FALSE(pref_value_store_->PrefValueFromUserStore(
       prefs::kCurrentThemeID));
 
   // Test a command-line preference.
   ASSERT_TRUE(pref_value_store_->HasPrefPath(prefs::kApplicationLocale));
   EXPECT_TRUE(pref_value_store_->PrefValueInUserStore(
@@ skipping 20 matching lines @@
   EXPECT_FALSE(pref_value_store_->PrefValueInUserStore(prefs::kDefaultPref));
   EXPECT_FALSE(pref_value_store_->PrefValueFromUserStore(prefs::kDefaultPref));
 
   // Test a preference for which the PrefValueStore does not contain a value.
   ASSERT_FALSE(pref_value_store_->HasPrefPath(prefs::kMissingPref));
   EXPECT_FALSE(pref_value_store_->PrefValueInUserStore(prefs::kMissingPref));
   EXPECT_FALSE(pref_value_store_->PrefValueFromUserStore(prefs::kMissingPref));
 }
 
 TEST_F(PrefValueStoreTest, PrefValueFromDefaultStore) {
-  // Test an enforced preference.
+  // Test a managed platform preference.
   ASSERT_TRUE(pref_value_store_->HasPrefPath(prefs::kHomePage));
   EXPECT_FALSE(pref_value_store_->PrefValueFromDefaultStore(prefs::kHomePage));
 
+  // Test a device management preference.
+  ASSERT_TRUE(pref_value_store_->HasPrefPath(
+      prefs::kDefaultSearchProviderName));
+  EXPECT_FALSE(pref_value_store_->PrefValueFromDefaultStore(
+      prefs::kDefaultSearchProviderName));
+
   // Test an extension preference.
   ASSERT_TRUE(pref_value_store_->HasPrefPath(prefs::kCurrentThemeID));
   EXPECT_FALSE(pref_value_store_->PrefValueFromDefaultStore(
       prefs::kCurrentThemeID));
 
   // Test a command-line preference.
   ASSERT_TRUE(pref_value_store_->HasPrefPath(prefs::kApplicationLocale));
   EXPECT_FALSE(pref_value_store_->PrefValueFromDefaultStore(
       prefs::kApplicationLocale));
 
@@ skipping 11 matching lines @@
   ASSERT_FALSE(pref_value_store_->HasPrefPath(prefs::kDefaultPref));
   EXPECT_TRUE(
       pref_value_store_->PrefValueFromDefaultStore(prefs::kDefaultPref));
 
   // Test a preference for which the PrefValueStore does not contain a value.
   ASSERT_FALSE(pref_value_store_->HasPrefPath(prefs::kMissingPref));
   EXPECT_FALSE(
       pref_value_store_->PrefValueFromDefaultStore(prefs::kMissingPref));
 }
 
+// Ensure that

[Mattias Nissler (ping if slow), 2010/11/12 15:02:13]

Ensure what?

[danno, 2010/11/12 16:17:30]

Done.

+TEST_F(PrefValueStoreTest, TestPlatformTrumpsDeviceManagementPolicy) {

[Mattias Nissler (ping if slow), 2010/11/12 15:02:13]

I believe this test would be covered by the missing one I noted above.

[danno, 2010/11/12 16:17:30]

Done.

+  // Test a preference for which the PrefValueStore does not contain a value.
+  ASSERT_FALSE(pref_value_store_->HasPrefPath(
+      prefs::kDefaultSearchProviderName));
+  EXPECT_FALSE(pref_value_store_->PrefValueInDeviceManagementStore(
+      prefs::kMissingPref));
+
+  Value* value = NULL;
+  ASSERT_TRUE(pref_value_store_->GetValue(prefs::kDefaultSearchProviderName,
+                                          &value));
+  std::string str_value;
+  EXPECT_TRUE(value->GetAsString(&str_value));
+  EXPECT_EQ(device_management_pref::kSearchProviderName, str_value);
+
+  managed_platform_prefs_->SetString(prefs::kDefaultSearchProviderName,
+                                     "override value");
+  ASSERT_TRUE(pref_value_store_->GetValue(prefs::kDefaultSearchProviderName,
+                                          &value));
+  EXPECT_TRUE(value->GetAsString(&str_value));
+  EXPECT_EQ("override value", str_value);
+}
+
 TEST_F(PrefValueStoreTest, TestPolicyRefresh) {
-  // pref_value_store_ is initialized by PrefValueStoreTest to have values
-  // in both it's managed and recommended store. By replacing them with
-  // dummy stores, all of the paths of the prefs originally managed and
-  // recommended stores should change.
+  // pref_value_store_ is initialized by PrefValueStoreTest to have values in
+  // the managed platform, device management and recommended stores. By
+  // replacing them with dummy stores, all of the paths of the prefs originally
+  // in the managed platform, device management and recommended stores should
+  // change.
   MockPolicyRefreshCallback callback;
   EXPECT_CALL(callback, DoCallback(_)).Times(0);
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       NewRunnableMethod(
           pref_value_store_.get(),
           &PrefValueStore::RefreshPolicyPrefs,
           NewCallback(&callback,
                       &MockPolicyRefreshCallback::DoCallback)));
   Mock::VerifyAndClearExpectations(&callback);
   EXPECT_CALL(callback, DoCallback(expected_differing_paths_)).Times(1);
   loop_.RunAllPending();
 }
 
 TEST_F(PrefValueStoreTest, TestRefreshPolicyPrefsCompletion) {
-  // Test changed preferences in managed store and removed
-  // preferences in the recommended store. In addition
-  // to "homepage", the other prefs that are set by default in
-  // the test class are removed by the DummyStore
-  scoped_ptr<DummyPrefStore> new_managed_store(new DummyPrefStore());
+  // Test changed preferences in the managed platform store and removed
+  // preferences in the recommended store. In addition to "homepage", the other
+  // prefs that are set by default in the test class are removed by the
+  // DummyStore.
+  scoped_ptr<DummyPrefStore> new_managed_platform_store(new DummyPrefStore());
   DictionaryValue* dict = new DictionaryValue();
   dict->SetString("homepage", "some other changed homepage");
-  new_managed_store->set_prefs(dict);
+  new_managed_platform_store->set_prefs(dict);
   MockPolicyRefreshCallback callback;
   EXPECT_CALL(callback, DoCallback(expected_differing_paths_)).Times(1);
   pref_value_store_->RefreshPolicyPrefsCompletion(
-      new_managed_store.release(),
+      new_managed_platform_store.release(),
+      new DummyPrefStore(),
       new DummyPrefStore(),
       NewCallback(&callback,
                   &MockPolicyRefreshCallback::DoCallback));
 
-  // Test properties that have been removed from the managed store.
+  // Test properties that have been removed from the managed platform store.
   // Homepage is still set in managed prefs.
   expected_differing_paths_.clear();
   expected_differing_paths_.push_back(std::string("homepage"));
   MockPolicyRefreshCallback callback2;
   EXPECT_CALL(callback2, DoCallback(expected_differing_paths_)).Times(1);
   pref_value_store_->RefreshPolicyPrefsCompletion(
       new DummyPrefStore(),
       new DummyPrefStore(),
+      new DummyPrefStore(),
       NewCallback(&callback2,
                   &MockPolicyRefreshCallback::DoCallback));
 
+  // Test properties that are added to the device management store.
+  expected_differing_paths_.clear();
+  expected_differing_paths_.push_back(std::string("homepage"));
+  scoped_ptr<DummyPrefStore> new_device_management_store(
+      new DummyPrefStore());
+  dict = new DictionaryValue();
+  dict->SetString("homepage", "some other changed homepage");
+  new_device_management_store->set_prefs(dict);
+  MockPolicyRefreshCallback callback3;
+  EXPECT_CALL(callback3, DoCallback(expected_differing_paths_)).Times(1);
+  pref_value_store_->RefreshPolicyPrefsCompletion(
+      new DummyPrefStore(),
+      new_device_management_store.release(),
+      new DummyPrefStore(),
+      NewCallback(&callback3,
+                  &MockPolicyRefreshCallback::DoCallback));
+
   // Test properties that are added to the recommended store.
   scoped_ptr<DummyPrefStore>  new_recommended_store(new DummyPrefStore());
   dict = new DictionaryValue();
   dict->SetString("homepage", "some other changed homepage 2");
   new_recommended_store->set_prefs(dict);
   expected_differing_paths_.clear();
   expected_differing_paths_.push_back(std::string("homepage"));
-  MockPolicyRefreshCallback callback3;
-  EXPECT_CALL(callback3, DoCallback(expected_differing_paths_)).Times(1);
+  MockPolicyRefreshCallback callback4;
+  EXPECT_CALL(callback4, DoCallback(expected_differing_paths_)).Times(1);
   pref_value_store_->RefreshPolicyPrefsCompletion(
       new DummyPrefStore(),
+      new DummyPrefStore(),
       new_recommended_store.release(),
-      NewCallback(&callback3,
+      NewCallback(&callback4,
                   &MockPolicyRefreshCallback::DoCallback));
 
   // Test adding a multi-key path.
-  new_managed_store.reset(new DummyPrefStore());
+  new_managed_platform_store.reset(new DummyPrefStore());
   dict = new DictionaryValue();
   dict->SetString("segment1.segment2", "value");
-  new_managed_store->set_prefs(dict);
+  new_managed_platform_store->set_prefs(dict);
   expected_differing_paths_.clear();
   expected_differing_paths_.push_back(std::string("homepage"));
   expected_differing_paths_.push_back(std::string("segment1"));
   expected_differing_paths_.push_back(std::string("segment1.segment2"));
-  MockPolicyRefreshCallback callback4;
-  EXPECT_CALL(callback4, DoCallback(expected_differing_paths_)).Times(1);
+  MockPolicyRefreshCallback callback5;
+  EXPECT_CALL(callback5, DoCallback(expected_differing_paths_)).Times(1);
   pref_value_store_->RefreshPolicyPrefsCompletion(
-      new_managed_store.release(),
+      new_managed_platform_store.release(),
       new DummyPrefStore(),
-      NewCallback(&callback4,
+      new DummyPrefStore(),
+      NewCallback(&callback5,
                   &MockPolicyRefreshCallback::DoCallback));
 }
 
 TEST_F(PrefValueStoreTest, TestConcurrentPolicyRefresh) {
   MockPolicyRefreshCallback callback1;
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       NewRunnableMethod(
           pref_value_store_.get(),
           &PrefValueStore::RefreshPolicyPrefs,
@@ skipping 23 matching lines @@
   Mock::VerifyAndClearExpectations(&callback1);
   Mock::VerifyAndClearExpectations(&callback2);
   Mock::VerifyAndClearExpectations(&callback3);
 
   EXPECT_CALL(callback1, DoCallback(expected_differing_paths_)).Times(1);
   std::vector<std::string> no_differing_paths;
   EXPECT_CALL(callback2, DoCallback(no_differing_paths)).Times(1);
   EXPECT_CALL(callback3, DoCallback(no_differing_paths)).Times(1);
   loop_.RunAllPending();
 }