Port DictionaryValue to use string16 instead of wstring.

chrome/common/pref_service.cc

 // Copyright (c) 2006-2008 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/common/pref_service.h"
 
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
@@ skipping 271 matching lines @@
 bool PrefService::IsPrefRegistered(const wchar_t* path) {
   DCHECK(CalledOnValidThread());
   // TODO(tc): We can remove this method and just use FindPreference.
   return FindPreference(path) ? true : false;
 }
 
 bool PrefService::GetBoolean(const wchar_t* path) const {
   DCHECK(CalledOnValidThread());
 
   bool result = false;
-  if (transient_->GetBoolean(path, &result))
+  if (transient_->GetBoolean(WideToUTF16Hack(path), &result))
     return result;
 
   const Preference* pref = FindPreference(path);
   if (!pref) {
     DCHECK(false) << "Trying to read an unregistered pref: " << path;
     return result;
   }
   bool rv = pref->GetValue()->GetAsBoolean(&result);
   DCHECK(rv);
   return result;
 }
 
 int PrefService::GetInteger(const wchar_t* path) const {
   DCHECK(CalledOnValidThread());
 
   int result = 0;
-  if (transient_->GetInteger(path, &result))
+  if (transient_->GetInteger(WideToUTF16Hack(path), &result))
     return result;
 
   const Preference* pref = FindPreference(path);
   if (!pref) {
     DCHECK(false) << "Trying to read an unregistered pref: " << path;
     return result;
   }
   bool rv = pref->GetValue()->GetAsInteger(&result);
   DCHECK(rv);
   return result;
 }
 
 double PrefService::GetReal(const wchar_t* path) const {
   DCHECK(CalledOnValidThread());
 
   double result = 0.0;
-  if (transient_->GetReal(path, &result))
+  if (transient_->GetReal(WideToUTF16Hack(path), &result))
     return result;
 
   const Preference* pref = FindPreference(path);
   if (!pref) {
     DCHECK(false) << "Trying to read an unregistered pref: " << path;
     return result;
   }
   bool rv = pref->GetValue()->GetAsReal(&result);
   DCHECK(rv);
   return result;
 }
 
 std::wstring PrefService::GetString(const wchar_t* path) const {
   DCHECK(CalledOnValidThread());
 
+  string16 result16;
+  if (transient_->GetString(WideToUTF16Hack(path), &result16))
+    return UTF16ToWideHack(result16);
+
   std::wstring result;
-  if (transient_->GetString(path, &result))
-    return result;
-
   const Preference* pref = FindPreference(path);
   if (!pref) {
 #if defined(OS_WIN)
     DCHECK(false) << "Trying to read an unregistered pref: " << path;
 #else
     // TODO(port): remove this exception
 #endif
     return result;
   }
   bool rv = pref->GetValue()->GetAsString(&result);
   DCHECK(rv);
   return result;
 }
 
 bool PrefService::HasPrefPath(const wchar_t* path) const {
   Value* value = NULL;
-  return (transient_->Get(path, &value) || persistent_->Get(path, &value));
+  string16 path16 = WideToUTF16Hack(path);
+  return (transient_->Get(path16, &value) || persistent_->Get(path16, &value));
 }
 
 const PrefService::Preference* PrefService::FindPreference(
     const wchar_t* pref_name) const {
   DCHECK(CalledOnValidThread());
   Preference p(NULL, pref_name, NULL);
   PreferenceSet::const_iterator it = prefs_.find(&p);
   return it == prefs_.end() ? NULL : *it;
 }
 
 const DictionaryValue* PrefService::GetDictionary(const wchar_t* path) const {
   DCHECK(CalledOnValidThread());
 
   DictionaryValue* result = NULL;
-  if (transient_->GetDictionary(path, &result))
+  if (transient_->GetDictionary(WideToUTF16Hack(path), &result))
     return result;
 
   const Preference* pref = FindPreference(path);
   if (!pref) {
     DCHECK(false) << "Trying to read an unregistered pref: " << path;
     return NULL;
   }
   const Value* value = pref->GetValue();
   if (value->GetType() == Value::TYPE_NULL)
     return NULL;
   return static_cast<const DictionaryValue*>(value);
 }
 
 const ListValue* PrefService::GetList(const wchar_t* path) const {
   DCHECK(CalledOnValidThread());
 
   ListValue* result = NULL;
-  if (transient_->GetList(path, &result))
+  if (transient_->GetList(WideToUTF16Hack(path), &result))
     return result;
 
   const Preference* pref = FindPreference(path);
   if (!pref) {
     DCHECK(false) << "Trying to read an unregistered pref: " << path;
     return NULL;
   }
   const Value* value = pref->GetValue();
   if (value->GetType() == Value::TYPE_NULL)
     return NULL;
@@ skipping 60 matching lines @@
 
 void PrefService::ClearPref(const wchar_t* path) {
   DCHECK(CalledOnValidThread());
 
   const Preference* pref = FindPreference(path);
   if (!pref) {
     DCHECK(false) << "Trying to clear an unregistered pref: " << path;
     return;
   }
 
-  transient_->Remove(path, NULL);
+  string16 path16 = WideToUTF16Hack(path);
+  transient_->Remove(path16, NULL);
   Value* value;
-  bool has_old_value = persistent_->Get(path, &value);
-  persistent_->Remove(path, NULL);
+  bool has_old_value = persistent_->Get(path16, &value);
+  persistent_->Remove(path16, NULL);
 
   if (has_old_value)
     FireObservers(path);
 }
 
 void PrefService::SetBoolean(const wchar_t* path, bool value) {
   DCHECK(CalledOnValidThread());
 
   const Preference* pref = FindPreference(path);
   if (!pref) {
     DCHECK(false) << "Trying to write an unregistered pref: " << path;
     return;
   }
   if (pref->type() != Value::TYPE_BOOLEAN) {
     DCHECK(false) << "Wrong type for SetBoolean: " << path;
     return;
   }
 
   scoped_ptr<Value> old_value(GetPrefCopy(path));
-  bool rv = persistent_->SetBoolean(path, value);
+  bool rv = persistent_->SetBoolean(WideToUTF16Hack(path), value);
   DCHECK(rv);
 
   FireObserversIfChanged(path, old_value.get());
 }
 
 void PrefService::SetInteger(const wchar_t* path, int value) {
   DCHECK(CalledOnValidThread());
 
   const Preference* pref = FindPreference(path);
   if (!pref) {
     DCHECK(false) << "Trying to write an unregistered pref: " << path;
     return;
   }
   if (pref->type() != Value::TYPE_INTEGER) {
     DCHECK(false) << "Wrong type for SetInteger: " << path;
     return;
   }
 
   scoped_ptr<Value> old_value(GetPrefCopy(path));
-  bool rv = persistent_->SetInteger(path, value);
+  bool rv = persistent_->SetInteger(WideToUTF16Hack(path), value);
   DCHECK(rv);
 
   FireObserversIfChanged(path, old_value.get());
 }
 
 void PrefService::SetReal(const wchar_t* path, double value) {
   DCHECK(CalledOnValidThread());
 
   const Preference* pref = FindPreference(path);
   if (!pref) {
     DCHECK(false) << "Trying to write an unregistered pref: " << path;
     return;
   }
   if (pref->type() != Value::TYPE_REAL) {
     DCHECK(false) << "Wrong type for SetReal: " << path;
     return;
   }
 
   scoped_ptr<Value> old_value(GetPrefCopy(path));
-  bool rv = persistent_->SetReal(path, value);
+  bool rv = persistent_->SetReal(WideToUTF16Hack(path), value);
   DCHECK(rv);
 
   FireObserversIfChanged(path, old_value.get());
 }
 
 void PrefService::SetString(const wchar_t* path, const std::wstring& value) {
   DCHECK(CalledOnValidThread());
 
   const Preference* pref = FindPreference(path);
   if (!pref) {
     DCHECK(false) << "Trying to write an unregistered pref: " << path;
     return;
   }
   if (pref->type() != Value::TYPE_STRING) {
     DCHECK(false) << "Wrong type for SetString: " << path;
     return;
   }
 
   scoped_ptr<Value> old_value(GetPrefCopy(path));
-  bool rv = persistent_->SetString(path, value);
+  bool rv = persistent_->SetString(WideToUTF16Hack(path),
+                                   WideToUTF16Hack(value));
   DCHECK(rv);
 
   FireObserversIfChanged(path, old_value.get());
 }
 
 DictionaryValue* PrefService::GetMutableDictionary(const wchar_t* path) {
   DCHECK(CalledOnValidThread());
 
   const Preference* pref = FindPreference(path);
   if (!pref) {
     DCHECK(false) << "Trying to get an unregistered pref: " << path;
     return NULL;
   }
   if (pref->type() != Value::TYPE_DICTIONARY) {
     DCHECK(false) << "Wrong type for GetMutableDictionary: " << path;
     return NULL;
   }
 
   DictionaryValue* dict = NULL;
-  bool rv = persistent_->GetDictionary(path, &dict);
+  string16 path16 = WideToUTF16Hack(path);
+  bool rv = persistent_->GetDictionary(path16, &dict);
   if (!rv) {
     dict = new DictionaryValue;
-    rv = persistent_->Set(path, dict);
+    rv = persistent_->Set(path16, dict);
     DCHECK(rv);
   }
   return dict;
 }
 
 ListValue* PrefService::GetMutableList(const wchar_t* path) {
   DCHECK(CalledOnValidThread());
 
   const Preference* pref = FindPreference(path);
   if (!pref) {
     DCHECK(false) << "Trying to get an unregistered pref: " << path;
     return NULL;
   }
   if (pref->type() != Value::TYPE_LIST) {
     DCHECK(false) << "Wrong type for GetMutableList: " << path;
     return NULL;
   }
 
   ListValue* list = NULL;
-  bool rv = persistent_->GetList(path, &list);
+  string16 path16 = WideToUTF16Hack(path);
+  bool rv = persistent_->GetList(path16, &list);
   if (!rv) {
     list = new ListValue;
-    rv = persistent_->Set(path, list);
+    rv = persistent_->Set(path16, list);
     DCHECK(rv);
   }
   return list;
 }
 
 Value* PrefService::GetPrefCopy(const wchar_t* path) {
   DCHECK(CalledOnValidThread());
 
   const Preference* pref = FindPreference(path);
   DCHECK(pref);
   return pref->GetValue()->DeepCopy();
 }
 
 void PrefService::FireObserversIfChanged(const wchar_t* path,
                                          const Value* old_value) {
   Value* new_value = NULL;
-  persistent_->Get(path, &new_value);
+  persistent_->Get(WideToUTF16Hack(path), &new_value);
   if (!old_value->Equals(new_value))
     FireObservers(path);
 }
 
 void PrefService::FireObservers(const wchar_t* path) {
   DCHECK(CalledOnValidThread());
 
   // Convert path to a std::wstring because the Details constructor requires a
   // class.
   std::wstring path_str(path);
@@ skipping 32 matching lines @@
   // easier for callers to check for empty list/dict prefs.
   if (Value::TYPE_LIST == type_ || Value::TYPE_DICTIONARY == type_)
     default_value_.reset(Value::CreateNullValue());
 }
 
 const Value* PrefService::Preference::GetValue() const {
   DCHECK(NULL != root_pref_) <<
       "Must register pref before getting its value";
 
   Value* temp_value = NULL;
-  if (root_pref_->Get(name_.c_str(), &temp_value) &&
+  if (root_pref_->Get(WideToUTF16Hack(name_), &temp_value) &&
       temp_value->GetType() == type_) {
     return temp_value;
   }
 
   // Pref not found, just return the app default.
   return default_value_.get();
 }
 
 bool PrefService::Preference::IsDefaultValue() const {
   DCHECK(default_value_.get());
   return default_value_->Equals(GetValue());
 }