Signed settings refactoring: Proper caching and more tests.

chrome/browser/chromeos/cros_settings.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 "chrome/browser/chromeos/cros_settings.h"
 
 #include "base/lazy_instance.h"
 #include "base/stl_util.h"
 #include "base/string_util.h"
 #include "base/values.h"
-#include "chrome/browser/chromeos/user_cros_settings_provider.h"
+#include "chrome/browser/chromeos/device_settings_provider.h"
 #include "chrome/browser/ui/webui/options/chromeos/system_settings_provider.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 
 namespace chromeos {
 
 static base::LazyInstance<CrosSettings> g_cros_settings =
     LAZY_INSTANCE_INITIALIZER;
@@ skipping 21 matching lines @@
     observer->Observe(chrome::NOTIFICATION_SYSTEM_SETTING_CHANGED,
                       content::Source<CrosSettings>(this),
                       content::Details<std::string>(&path_str));
   }
 }
 
 void CrosSettings::Set(const std::string& path, const base::Value& in_value) {
   DCHECK(CalledOnValidThread());
   CrosSettingsProvider* provider;
   provider = GetProvider(path);
-  if (provider) {
+  if (provider)
     provider->Set(path, in_value);
-  }
 }
 
 void CrosSettings::SetBoolean(const std::string& path, bool in_value) {
   DCHECK(CalledOnValidThread());
   base::FundamentalValue value(in_value);
   Set(path, value);
 }
 
 void CrosSettings::SetInteger(const std::string& path, int in_value) {
   DCHECK(CalledOnValidThread());
@@ skipping 31 matching lines @@
   scoped_ptr<base::Value> new_value(
       old_value ? old_value->DeepCopy() : new base::ListValue());
   static_cast<base::ListValue*>(new_value.get())->Remove(*value, NULL);
   Set(path, *new_value);
 }
 
 bool CrosSettings::FindEmailInList(const std::string& path,
                                    const std::string& email) const {
   DCHECK(CalledOnValidThread());
   base::StringValue email_value(email);
-  const base::ListValue* value =
-      static_cast<const base::ListValue*>(GetPref(path));
+  const base::ListValue* value(
+      static_cast<const base::ListValue*>(GetPref(path)));
   if (value) {
     if (value->Find(email_value) != value->end())
       return true;
     std::string::size_type at_pos = email.find('@');
     if (at_pos != std::string::npos) {
       base::StringValue wildcarded_value(
           std::string("*").append(email.substr(at_pos)));
       return value->Find(wildcarded_value) != value->end();
     }
   }
@@ skipping 18 matching lines @@
 }
 
 void CrosSettings::AddSettingsObserver(const char* path,
                                        content::NotificationObserver* obs) {
   DCHECK(path);
   DCHECK(obs);
   DCHECK(CalledOnValidThread());
 
   if (!GetProvider(std::string(path))) {
     NOTREACHED() << "Trying to add an observer for an unregistered setting: "
-        << path;
+                 << path;
     return;
   }
 
   // Get the settings observer list associated with the path.
   NotificationObserverList* observer_list = NULL;
   SettingsObserverMap::iterator observer_iterator =
       settings_observers_.find(path);
   if (observer_iterator == settings_observers_.end()) {
     observer_list = new NotificationObserverList;
     settings_observers_[path] = observer_list;
@@ skipping 13 matching lines @@
   // Ok, safe to add the pref observer.
   observer_list->AddObserver(obs);
 }
 
 void CrosSettings::RemoveSettingsObserver(const char* path,
                                           content::NotificationObserver* obs) {
   DCHECK(CalledOnValidThread());
 
   SettingsObserverMap::iterator observer_iterator =
       settings_observers_.find(path);
-  if (observer_iterator == settings_observers_.end()) {
+  if (observer_iterator == settings_observers_.end())
     return;
-  }
 
   NotificationObserverList* observer_list = observer_iterator->second;
   observer_list->RemoveObserver(obs);
 }
 
 CrosSettingsProvider* CrosSettings::GetProvider(
     const std::string& path) const {
   for (size_t i = 0; i < providers_.size(); ++i) {
     if (providers_[i]->HandlesSetting(path))
       return providers_[i];
   }
   return NULL;
 }
 
+void CrosSettings::ReloadProviders() {
+  for (size_t i = 0; i < providers_.size(); ++i)
+    providers_[i]->Reload();
+}
+
 const base::Value* CrosSettings::GetPref(const std::string& path) const {
   DCHECK(CalledOnValidThread());
   CrosSettingsProvider* provider = GetProvider(path);
   if (provider)
     return provider->Get(path);
   NOTREACHED() << path << " preference was not found in the signed settings.";
   return NULL;
 }
 
 bool CrosSettings::GetTrusted(const std::string& path,
@@ skipping 46 matching lines @@
                            const base::ListValue** out_value) const {
   DCHECK(CalledOnValidThread());
   const base::Value* value = GetPref(path);
   if (value)
     return value->GetAsList(out_value);
   return false;
 }
 
 CrosSettings::CrosSettings() {
   AddSettingsProvider(new SystemSettingsProvider());
-  AddSettingsProvider(new UserCrosSettingsProvider());
+  AddSettingsProvider(new DeviceSettingsProvider());
 }
 
 CrosSettings::~CrosSettings() {
   STLDeleteElements(&providers_);
   STLDeleteValues(&settings_observers_);
 }
 
 }  // namespace chromeos