Introduce incognito preference settings.

chrome/browser/prefs/pref_value_store.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 "chrome/browser/prefs/pref_value_store.h"
 
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/policy/configuration_policy_pref_store.h"
 #include "chrome/browser/prefs/pref_notifier.h"
 #include "chrome/common/notification_service.h"
 
 PrefValueStore::PrefStoreKeeper::PrefStoreKeeper()
     : pref_value_store_(NULL),
       type_(PrefValueStore::INVALID_STORE) {
 }
 
 PrefValueStore::PrefStoreKeeper::~PrefStoreKeeper() {
   if (pref_store_.get())
     pref_store_->RemoveObserver(this);
 }
 
 void PrefValueStore::PrefStoreKeeper::Initialize(
     PrefValueStore* store,
     PrefStore* pref_store,
     PrefValueStore::PrefStoreType type) {
   if (pref_store_.get())
     pref_store_->RemoveObserver(this);
   type_ = type;
   pref_value_store_ = store;
-  pref_store_.reset(pref_store);
+  pref_store_ = pref_store;
   if (pref_store_.get())
     pref_store_->AddObserver(this);
 }
 
 void PrefValueStore::PrefStoreKeeper::OnPrefValueChanged(
     const std::string& key) {
   pref_value_store_->OnPrefValueChanged(type_, key);
 }
 
 void PrefValueStore::PrefStoreKeeper::OnInitializationCompleted() {
@@ skipping 23 matching lines @@
   registrar_.Add(this,
                  NotificationType(NotificationType::POLICY_CHANGED),
                  NotificationService::AllSources());
 
   CheckInitializationCompleted();
 }
 
 PrefValueStore::~PrefValueStore() {}
 
 bool PrefValueStore::GetValue(const std::string& name,
+                              Value::ValueType type,
                               Value** out_value) const {
+  *out_value = NULL;
   // Check the |PrefStore|s in order of their priority from highest to lowest
   // to find the value of the preference described by the given preference name.
   for (size_t i = 0; i <= PREF_STORE_TYPE_MAX; ++i) {
     if (GetValueFromStore(name.c_str(), static_cast<PrefStoreType>(i),
-                          out_value))
+                          out_value)) {
+      if (!(*out_value)->IsType(type)) {
+        LOG(WARNING) << "Expected type for " << name << " is " << type
+                     << " but got " << (*out_value)->GetType()
+                     << " in store " << i;
+        continue;
+      }
       return true;
+    }
   }
   return false;
 }
 
-void PrefValueStore::RegisterPreferenceType(const std::string& name,
-                                            Value::ValueType type) {
-  pref_types_[name] = type;
-}
-
-Value::ValueType PrefValueStore::GetRegisteredType(
-    const std::string& name) const {
-  PrefTypeMap::const_iterator found = pref_types_.find(name);
-  if (found == pref_types_.end())
-    return Value::TYPE_NULL;
-  return found->second;
-}
-
-bool PrefValueStore::HasPrefPath(const char* path) const {
-  Value* tmp_value = NULL;
-  const std::string name(path);
-  bool rv = GetValue(name, &tmp_value);
-  // Merely registering a pref doesn't count as "having" it: we require a
-  // non-default value set.
-  return rv && !PrefValueFromDefaultStore(path);
-}
-
 void PrefValueStore::NotifyPrefChanged(
     const char* path,
     PrefValueStore::PrefStoreType new_store) {
   DCHECK(new_store != INVALID_STORE);
 
-  // If this pref is not registered, just discard the notification.
-  if (!pref_types_.count(path))
-    return;
-
   bool changed = true;
   // Replying that the pref has changed in case the new store is invalid may
   // cause problems, but it's the safer choice.
   if (new_store != INVALID_STORE) {
     PrefStoreType controller = ControllingPrefStoreForPref(path);
     DCHECK(controller != INVALID_STORE);
     // If the pref is controlled by a higher-priority store, its effective value
     // cannot have changed.
     if (controller != INVALID_STORE &&
         controller < new_store) {
@@ skipping 32 matching lines @@
 bool PrefValueStore::PrefValueFromDefaultStore(const char* name) const {
   return ControllingPrefStoreForPref(name) == DEFAULT_STORE;
 }
 
 bool PrefValueStore::PrefValueUserModifiable(const char* name) const {
   PrefStoreType effective_store = ControllingPrefStoreForPref(name);
   return effective_store >= USER_STORE ||
          effective_store == INVALID_STORE;
 }
 
-// Returns true if the actual value is a valid type for the expected type when
-// found in the given store.
-bool PrefValueStore::IsValidType(Value::ValueType expected,
-                                 Value::ValueType actual,
-                                 PrefValueStore::PrefStoreType store) {
-  if (expected == actual)
-    return true;
-
-  // Dictionaries and lists are allowed to hold TYPE_NULL values too, but only
-  // in the default pref store.
-  if (store == DEFAULT_STORE &&
-      actual == Value::TYPE_NULL &&
-      (expected == Value::TYPE_DICTIONARY || expected == Value::TYPE_LIST)) {
-    return true;
-  }
-  return false;
-}
-
 bool PrefValueStore::PrefValueInStore(
     const char* name,
     PrefValueStore::PrefStoreType store) const {
   // Declare a temp Value* and call GetValueFromStore,
   // ignoring the output value.
   Value* tmp_value = NULL;
   return GetValueFromStore(name, store, &tmp_value);
 }
 
 bool PrefValueStore::PrefValueInStoreRange(
@@ skipping 31 matching lines @@
   if (store) {
     switch (store->GetValue(name, out_value)) {
       case PrefStore::READ_USE_DEFAULT:
         store = GetPrefStore(DEFAULT_STORE);
         if (!store || store->GetValue(name, out_value) != PrefStore::READ_OK) {
           *out_value = NULL;
           return false;
         }
         // Fall through...
       case PrefStore::READ_OK:
-        if (IsValidType(GetRegisteredType(name),
-                        (*out_value)->GetType(),
-                        store_type)) {
-          return true;
-        }
-        break;
+        return true;
       case PrefStore::READ_NO_VALUE:
         break;
     }
   }
 
   // No valid value found for the given preference name: set the return false.
   *out_value = NULL;
   return false;
 }
 
 void PrefValueStore::RefreshPolicyPrefsOnFileThread(
     BrowserThread::ID calling_thread_id,
-    policy::ConfigurationPolicyPrefStore* new_managed_platform_pref_store,
-    policy::ConfigurationPolicyPrefStore* new_device_management_pref_store,
-    policy::ConfigurationPolicyPrefStore* new_recommended_pref_store) {
+    scoped_refptr<policy::ConfigurationPolicyPrefStore>
+        managed_platform_pref_store,
+    scoped_refptr<policy::ConfigurationPolicyPrefStore>
+        device_management_pref_store,
+    scoped_refptr<policy::ConfigurationPolicyPrefStore>
+        recommended_pref_store) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
-  scoped_ptr<policy::ConfigurationPolicyPrefStore> managed_platform_pref_store(
-      new_managed_platform_pref_store);
-  scoped_ptr<policy::ConfigurationPolicyPrefStore> device_management_pref_store(
-      new_device_management_pref_store);
-  scoped_ptr<policy::ConfigurationPolicyPrefStore> recommended_pref_store(
-      new_recommended_pref_store);
 
   BrowserThread::PostTask(
       calling_thread_id, FROM_HERE,
       NewRunnableMethod(this,
                         &PrefValueStore::RefreshPolicyPrefsCompletion,
-                        managed_platform_pref_store.release(),
-                        device_management_pref_store.release(),
-                        recommended_pref_store.release()));
+                        managed_platform_pref_store,
+                        device_management_pref_store,
+                        recommended_pref_store));
 }
 
 void PrefValueStore::RefreshPolicyPrefs() {
   using policy::ConfigurationPolicyPrefStore;
   // Because loading of policy information must happen on the FILE
   // thread, it's not possible to just replace the contents of the
   // managed and recommended stores in place due to possible
   // concurrent access from the UI thread. Instead, new stores are
   // created and the refreshed policy read into them. The new stores
   // are swapped with the old from a Task on the UI thread after the
   // load is complete.
   ConfigurationPolicyPrefStore* new_managed_platform_pref_store(
       ConfigurationPolicyPrefStore::CreateManagedPlatformPolicyPrefStore());
   ConfigurationPolicyPrefStore* new_device_management_pref_store(
       ConfigurationPolicyPrefStore::CreateDeviceManagementPolicyPrefStore(
           profile_));
   ConfigurationPolicyPrefStore* new_recommended_pref_store(
       ConfigurationPolicyPrefStore::CreateRecommendedPolicyPrefStore());
   BrowserThread::ID current_thread_id;
   CHECK(BrowserThread::GetCurrentThreadIdentifier(&current_thread_id));
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
       NewRunnableMethod(this,
                         &PrefValueStore::RefreshPolicyPrefsOnFileThread,
                         current_thread_id,
-                        new_managed_platform_pref_store,
-                        new_device_management_pref_store,
-                        new_recommended_pref_store));
+                        make_scoped_refptr(new_managed_platform_pref_store),
+                        make_scoped_refptr(new_device_management_pref_store),
+                        make_scoped_refptr(new_recommended_pref_store)));
 }
 
 void PrefValueStore::RefreshPolicyPrefsCompletion(
     policy::ConfigurationPolicyPrefStore* new_managed_platform_pref_store,
     policy::ConfigurationPolicyPrefStore* new_device_management_pref_store,
     policy::ConfigurationPolicyPrefStore* new_recommended_pref_store) {
   // Determine the paths of all the changed preferences values in the three
   // policy-related stores (managed platform, device management and
   // recommended).
   DictionaryValue* managed_platform_prefs_before(
@@ skipping 85 matching lines @@
   CheckInitializationCompleted();
 }
 
 void PrefValueStore::InitPrefStore(PrefValueStore::PrefStoreType type,
                                    PrefStore* pref_store) {
   pref_stores_[type].Initialize(this, pref_store, type);
 }
 
 void PrefValueStore::CheckInitializationCompleted() {
   for (size_t i = 0; i <= PREF_STORE_TYPE_MAX; ++i) {
-    PrefStore* store = GetPrefStore(static_cast<PrefStoreType>(i));
+    scoped_refptr<PrefStore> store =
+        GetPrefStore(static_cast<PrefStoreType>(i));
     if (store && !store->IsInitializationComplete())
       return;
   }
   pref_notifier_->OnInitializationCompleted();
 }