Fixed the value of "controlledBy" for preferences when they're set by the user.

BUG=107098, 106592
TEST=unit_tests:PrefValueStoreTest.*


Review URL: http://codereview.chromium.org/8896023

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114009 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/prefs/pref_service.cc

@@ -907,6 +907,10 @@ bool PrefService::Preference::IsManaged() const {
   return pref_value_store()->PrefValueInManagedStore(name_.c_str());
 }
 
+bool PrefService::Preference::IsRecommended() const {
+  return pref_value_store()->PrefValueFromRecommendedStore(name_.c_str());
+}
+
 bool PrefService::Preference::HasExtensionSetting() const {
   return pref_value_store()->PrefValueInExtensionStore(name_.c_str());
 }

chrome/browser/prefs/pref_service.h

@@ -78,6 +78,10 @@ class PrefService : public base::NonThreadSafe {
     // whether the pref is actually being controlled by the policy setting.
     bool IsManaged() const;
 
+    // Returns true if the Preference is recommended, i.e. set by an admin
+    // policy but the user is allowed to change it.
+    bool IsRecommended() const;
+
     // Returns true if the Preference has a value set by an extension, even if
     // that value is being overridden by a higher-priority source.
     bool HasExtensionSetting() const;

chrome/browser/prefs/pref_value_store.cc

@@ -164,6 +164,11 @@ bool PrefValueStore::PrefValueFromUserStore(const char* name) const {
   return ControllingPrefStoreForPref(name) == USER_STORE;
 }
 
+bool PrefValueStore::PrefValueFromRecommendedStore(const char* name) const {
+  return ControllingPrefStoreForPref(name) == RECOMMENDED_PLATFORM_STORE ||
+         ControllingPrefStoreForPref(name) == RECOMMENDED_CLOUD_STORE;
+}
+
 bool PrefValueStore::PrefValueFromDefaultStore(const char* name) const {
   return ControllingPrefStoreForPref(name) == DEFAULT_STORE;
 }

chrome/browser/prefs/pref_value_store.h

@@ -94,6 +94,7 @@ class PrefValueStore {
   // a higher-priority source.
   bool PrefValueFromExtensionStore(const char* name) const;
   bool PrefValueFromUserStore(const char* name) const;
+  bool PrefValueFromRecommendedStore(const char* name) const;
   bool PrefValueFromDefaultStore(const char* name) const;
 
   // Check whether a Preference value is modifiable by the user, i.e. whether

chrome/browser/prefs/pref_value_store_unittest.cc

@@ -610,6 +610,27 @@ TEST_F(PrefValueStoreTest, PrefValueFromUserStore) {
       prefs::kMissingPref));
 }
 
+TEST_F(PrefValueStoreTest, PrefValueFromRecommendedStore) {
+  EXPECT_FALSE(pref_value_store_->PrefValueFromRecommendedStore(
+      prefs::kManagedPlatformPref));
+  EXPECT_FALSE(pref_value_store_->PrefValueFromRecommendedStore(
+      prefs::kManagedCloudPref));
+  EXPECT_FALSE(pref_value_store_->PrefValueFromRecommendedStore(
+      prefs::kExtensionPref));
+  EXPECT_FALSE(pref_value_store_->PrefValueFromRecommendedStore(
+      prefs::kCommandLinePref));
+  EXPECT_FALSE(pref_value_store_->PrefValueFromRecommendedStore(
+      prefs::kUserPref));
+  EXPECT_TRUE(pref_value_store_->PrefValueFromRecommendedStore(
+      prefs::kRecommendedPlatformPref));
+  EXPECT_TRUE(pref_value_store_->PrefValueFromRecommendedStore(
+      prefs::kRecommendedCloudPref));
+  EXPECT_FALSE(pref_value_store_->PrefValueFromRecommendedStore(
+      prefs::kDefaultPref));
+  EXPECT_FALSE(pref_value_store_->PrefValueFromRecommendedStore(
+      prefs::kMissingPref));
+}
+
 TEST_F(PrefValueStoreTest, PrefValueFromDefaultStore) {
   EXPECT_FALSE(pref_value_store_->PrefValueFromDefaultStore(
       prefs::kManagedPlatformPref));

chrome/browser/ui/webui/options/core_options_handler.cc

@@ -272,8 +272,7 @@ DictionaryValue* CoreOptionsHandler::CreateValueForPref(
     dict->SetString("controlledBy", "policy");
   } else if (controlling_pref->IsExtensionControlled()) {
     dict->SetString("controlledBy", "extension");
-  } else if (controlling_pref->IsUserModifiable() &&
-             !controlling_pref->IsDefaultValue()) {
+  } else if (controlling_pref->IsRecommended()) {
     dict->SetString("controlledBy", "recommended");
   }
   dict->SetBoolean("disabled", !controlling_pref->IsUserModifiable());