Rename DictionaryValue's SetStringFromUTF16() to SetString() (and overload).

chrome/browser/background_contents_service.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/background_contents_service.h"
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 16 matching lines @@
 // prefs::kRegisteredBackgroundContents). Information about each
 // BackgroundContents is stored under that top-level DictionaryValue, keyed
 // by the parent application ID for easy lookup.
 //
 // kRegisteredBackgroundContents:
 //    DictionaryValue {
 //       <appid_1>: { "url": <url1>, "name": <frame_name> },
 //       <appid_2>: { "url": <url2>, "name": <frame_name> },
 //         ... etc ...
 //    }
-const wchar_t kUrlKey[] = L"url";
-const wchar_t kFrameNameKey[] = L"name";
+const char kUrlKey[] = "url";
+const char kFrameNameKey[] = "name";
 
 BackgroundContentsService::BackgroundContentsService(
     Profile* profile, const CommandLine* command_line)
     : prefs_(NULL),
       always_keep_alive_(command_line->HasSwitch(switches::kKeepAliveForTest)) {
   // Don't load/store preferences if the proper switch is not enabled, or if
   // the parent profile is off the record.
   if (!profile->IsOffTheRecord() &&
       command_line->HasSwitch(switches::kRestoreBackgroundContents))
     prefs_ = profile->GetPrefs();
@@ skipping 164 matching lines @@
   DictionaryValue* pref = prefs_->GetMutableDictionary(
       prefs::kRegisteredBackgroundContents);
   const string16& appid = GetParentApplicationId(background_contents);
   DictionaryValue* current;
   if (pref->GetDictionaryWithoutPathExpansion(UTF16ToWide(appid), &current))
     return;
 
   // No entry for this application yet, so add one.
   DictionaryValue* dict = new DictionaryValue();
   dict->SetString(kUrlKey, background_contents->GetURL().spec());
-  dict->SetStringFromUTF16(kFrameNameKey, contents_map_[appid].frame_name);
+  dict->SetString(kFrameNameKey, contents_map_[appid].frame_name);
   pref->SetWithoutPathExpansion(UTF16ToWide(appid), dict);
   prefs_->ScheduleSavePersistentPrefs();
 }
 
 void BackgroundContentsService::UnregisterBackgroundContents(
     BackgroundContents* background_contents) {
   if (!prefs_)
     return;
   DCHECK(IsTracked(background_contents));
   const string16 appid = GetParentApplicationId(background_contents);
@@ skipping 59 matching lines @@
     if (contents == it->second.contents)
       return it->first;
   }
   return EmptyString16();
 }
 
 // static
 void BackgroundContentsService::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterDictionaryPref(prefs::kRegisteredBackgroundContents);
 }