Remove deprecated wstring Get(As)String() methods from Value, etc.

chrome/installer/util/master_preferences.cc

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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/installer/util/master_preferences.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "chrome/common/json_value_serializer.h"
 #include "chrome/installer/util/util_constants.h"
 #include "googleurl/src/gurl.h"
 
 
 namespace {
-const wchar_t* kDistroDict = L"distribution";
+
+const char kDistroDict[] = "distribution";
 
 bool GetGURLFromValue(const Value* in_value, GURL* out_value) {
   if (!in_value || !out_value)
     return false;
   std::string url;
   in_value->GetAsString(&url);
   GURL gurl(url);
   *out_value = gurl;
   return true;
 }
 
-std::vector<GURL> GetNamedList(const wchar_t* name,
+std::vector<GURL> GetNamedList(const char* name,
                                const DictionaryValue* prefs) {
   std::vector<GURL> list;
   if (!prefs)
     return list;
   ListValue* value_list = NULL;
   if (!prefs->GetList(name, &value_list))
     return list;
   for (size_t i = 0; i < value_list->GetSize(); ++i) {
     Value* entry;
     GURL gurl_entry;
     if (!value_list->Get(i, &entry) || !GetGURLFromValue(entry, &gurl_entry)) {
       NOTREACHED();
       break;
     }
     list.push_back(gurl_entry);
   }
   return list;
 }
 
-}
+}  // namespace
 
 namespace installer_util {
 
 bool GetDistroBooleanPreference(const DictionaryValue* prefs,
-                                const std::wstring& name,
+                                const std::string& name,
                                 bool* value) {
   if (!prefs || !value)
     return false;
 
   DictionaryValue* distro = NULL;
   if (!prefs->GetDictionary(kDistroDict, &distro) || !distro)
     return false;
 
   if (!distro->GetBoolean(name, value))
     return false;
 
   return true;
 }
 
 bool GetDistroStringPreference(const DictionaryValue* prefs,
-                               const std::wstring& name,
-                               std::wstring* value) {
+                               const std::string& name,
+                               std::string* value) {
   if (!prefs || !value)
     return false;
 
   DictionaryValue* distro = NULL;
   if (!prefs->GetDictionary(kDistroDict, &distro) || !distro)
     return false;
 
-  std::wstring str_value;
+  std::string str_value;
   if (!distro->GetString(name, &str_value))
     return false;
 
   if (str_value.empty())
     return false;
 
   *value = str_value;
   return true;
 }
 
 bool GetDistroIntegerPreference(const DictionaryValue* prefs,
-                                const std::wstring& name,
+                                const std::string& name,
                                 int* value) {
   if (!prefs || !value)
     return false;
 
   DictionaryValue* distro = NULL;
   if (!prefs->GetDictionary(kDistroDict, &distro) || !distro)
     return false;
 
   if (!distro->GetInteger(name, value))
     return false;
@@ skipping 77 matching lines @@
   if (!root.get())
     return NULL;
 
   if (!root->IsType(Value::TYPE_DICTIONARY))
     return NULL;
 
   return static_cast<DictionaryValue*>(root.release());
 }
 
 std::vector<GURL> GetFirstRunTabs(const DictionaryValue* prefs) {
-  return GetNamedList(L"first_run_tabs", prefs);
+  return GetNamedList("first_run_tabs", prefs);
 }
 
 bool SetDistroBooleanPreference(DictionaryValue* prefs,
-                                const std::wstring& name,
+                                const std::string& name,
                                 bool value) {
   if (!prefs || name.empty())
     return false;
-  prefs->SetBoolean(std::wstring(kDistroDict) + L"." + name, value);
+  prefs->SetBoolean(std::string(kDistroDict) + "." + name, value);
   return true;
 }
 
 bool HasExtensionsBlock(const DictionaryValue* prefs,
                         DictionaryValue** extensions) {
   return (prefs->GetDictionary(master_preferences::kExtensionsBlock,
                                extensions));
 }
 
 }  // installer_util