PART2: Make SignedSettings use proper Value types instead of string all around the place.

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"
@@ skipping 29 matching lines @@
 
   NotificationObserverList::Iterator it(*(observer_iterator->second));
   content::NotificationObserver* observer;
   while ((observer = it.GetNext()) != NULL) {
     observer->Observe(chrome::NOTIFICATION_SYSTEM_SETTING_CHANGED,
                       content::Source<CrosSettings>(this),
                       content::Details<std::string>(&path_str));
   }
 }
 
-void CrosSettings::Set(const std::string& path, Value* in_value) {
+void CrosSettings::Set(const std::string& path, const base::Value& in_value) {
   DCHECK(CalledOnValidThread());
   CrosSettingsProvider* provider;
   provider = GetProvider(path);
   if (provider) {
     provider->Set(path, in_value);
   }
 }
 
 void CrosSettings::SetBoolean(const std::string& path, bool in_value) {
   DCHECK(CalledOnValidThread());
-  Set(path, Value::CreateBooleanValue(in_value));
+  base::FundamentalValue value(in_value);
+  Set(path, value);
 }
 
 void CrosSettings::SetInteger(const std::string& path, int in_value) {
   DCHECK(CalledOnValidThread());
-  Set(path, Value::CreateIntegerValue(in_value));
+  base::FundamentalValue value(in_value);
+  Set(path, value);
 }
 
 void CrosSettings::SetDouble(const std::string& path, double in_value) {
   DCHECK(CalledOnValidThread());
-  Set(path, Value::CreateDoubleValue(in_value));
+  base::FundamentalValue value(in_value);
+  Set(path, value);
 }
 
 void CrosSettings::SetString(const std::string& path,
                              const std::string& in_value) {
   DCHECK(CalledOnValidThread());
-  Set(path, Value::CreateStringValue(in_value));
+  base::StringValue value(in_value);
+  Set(path, value);
+}
+
+void CrosSettings::AppendToList(const std::string& path,
+                                const base::Value* value) {
+  DCHECK(CalledOnValidThread());
+  const base::Value* old_value = GetPref(path);
+  scoped_ptr<base::Value> new_value(
+      old_value ? old_value->DeepCopy() : new base::ListValue());
+  static_cast<base::ListValue*>(new_value.get())->Append(value->DeepCopy());
+  Set(path, *new_value);
+}
+
+void CrosSettings::RemoveFromList(const std::string& path,
+                                  const base::Value* value) {
+  DCHECK(CalledOnValidThread());
+  const base::Value* old_value = GetPref(path);
+  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));
+  if (value) {
+    if (value->Find(email_value) != value->end())
+      return true;
+    if (email.find('@') != std::string::npos) {
+      base::StringValue wildcarded_value(
+          std::string("*").append(email.substr(email.find('@'))));

[Mattias Nissler (ping if slow), 2011/10/28 14:44:07]

you call email.find twice. Create local variable?

[pastarmovj, 2011/11/18 13:18:42]

Done.

+      return value->Find(wildcarded_value) != value->end();
+    }
+  }
+  return false;
 }
 
 bool CrosSettings::AddSettingsProvider(CrosSettingsProvider* provider) {
   DCHECK(CalledOnValidThread());
   providers_.push_back(provider);
   return true;
 }
 
 bool CrosSettings::RemoveSettingsProvider(CrosSettingsProvider* provider) {
   DCHECK(CalledOnValidThread());
@@ skipping 135 matching lines @@
   AddSettingsProvider(new SystemSettingsProvider());
   AddSettingsProvider(new UserCrosSettingsProvider());
 }
 
 CrosSettings::~CrosSettings() {
   STLDeleteElements(&providers_);
   STLDeleteValues(&settings_observers_);
 }
 
 }  // namespace chromeos