Pref service strings should be std::string.

Part 1: Convert RegisterStringPref.

BUG=none
TEST=compile

Review URL: http://codereview.chromium.org/2809022

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50202 0039d316-1c4b-4281-b951-d872f2087c98

24 files changed, 60 insertions, 58 deletions

diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index 46518f3..a85e72a 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -1809,7 +1809,7 @@ void Browser::RegisterPrefs(PrefService* prefs) {
 // static
 void Browser::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterStringPref(prefs::kHomePage,
-                            ASCIIToWide(chrome::kChromeUINewTabURL));
+                            chrome::kChromeUINewTabURL);
   prefs->RegisterBooleanPref(prefs::kHomePageIsNewTabPage, true);
   prefs->RegisterBooleanPref(prefs::kClearSiteDataOnExit, false);
   prefs->RegisterBooleanPref(prefs::kShowHomeButton, false);
@@ -1825,7 +1825,7 @@ void Browser::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterBooleanPref(prefs::kShowPageOptionsButtons, false);
   prefs->RegisterBooleanPref(prefs::kShowUpdatePromotionInfoBar, true);
 #endif
-  prefs->RegisterStringPref(prefs::kRecentlySelectedEncoding, L"");
+  prefs->RegisterStringPref(prefs::kRecentlySelectedEncoding, "");
   prefs->RegisterBooleanPref(prefs::kDeleteBrowsingHistory, true);
   prefs->RegisterBooleanPref(prefs::kDeleteDownloadHistory, true);
   prefs->RegisterBooleanPref(prefs::kDeleteCache, true);
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index 9bec9f2..712f7e1 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -416,7 +416,7 @@ PrefService* InitializeLocalState(const CommandLine& parsed_command_line,
   // Initialize ResourceBundle which handles files loaded from external
   // sources. This has to be done before uninstall code path and before prefs
   // are registered.
-  local_state->RegisterStringPref(prefs::kApplicationLocale, L"");
+  local_state->RegisterStringPref(prefs::kApplicationLocale, "");
   local_state->RegisterBooleanPref(prefs::kMetricsReportingEnabled,
       GoogleUpdateSettings::GetCollectStatsConsent());
 
@@ -447,7 +447,7 @@ PrefService* InitializeLocalState(const CommandLine& parsed_command_line,
     scoped_ptr<PrefService> parent_local_state(
         PrefService::CreatePrefService(parent_profile));
     parent_local_state->RegisterStringPref(prefs::kApplicationLocale,
-                                           std::wstring());
+                                           std::string());
     // Right now, we only inherit the locale setting from the parent profile.
     local_state->SetString(
         prefs::kApplicationLocale,
diff --git a/chrome/browser/chromeos/language_preferences.h b/chrome/browser/chromeos/language_preferences.h
index 02a7744..8dc89eb 100644
--- a/chrome/browser/chromeos/language_preferences.h
+++ b/chrome/browser/chromeos/language_preferences.h
@@ -50,10 +50,10 @@ const char kPreviousEngineConfigName[] = "previous_engine";
 // Chrome OS actually generates Zenkaku_Hankaku when the keyboard gets ready.
 
 // ibus-daemon accepts up to 5 next-engine hot-keys.
-const wchar_t kHotkeyNextEngineInMenu[] =
-    L"Alt+Shift_L,Shift+Meta_L,Control+Shift+space,Zenkaku_Hankaku";
+const char kHotkeyNextEngineInMenu[] =
+    "Alt+Shift_L,Shift+Meta_L,Control+Shift+space,Zenkaku_Hankaku";
 // TODO(suzhe): Add more key bindings?
-const wchar_t kHotkeyPreviousEngine[] = L"Control+space";
+const char kHotkeyPreviousEngine[] = "Control+space";
 
 // For Simplified Chinese input method (ibus-chewing)
 const char kChewingSectionName[] = "engine/Chewing";
diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc
index 2f58407..04d02c1 100644
--- a/chrome/browser/chromeos/preferences.cc
+++ b/chrome/browser/chromeos/preferences.cc
@@ -19,20 +19,20 @@ namespace chromeos {
 
 // static
 void Preferences::RegisterUserPrefs(PrefService* prefs) {
-  prefs->RegisterStringPref(prefs::kTimeZone, L"US/Pacific");
+  prefs->RegisterStringPref(prefs::kTimeZone, "US/Pacific");
   prefs->RegisterBooleanPref(prefs::kTapToClickEnabled, false);
   prefs->RegisterBooleanPref(prefs::kAccessibilityEnabled, false);
   prefs->RegisterBooleanPref(prefs::kVertEdgeScrollEnabled, false);
   prefs->RegisterIntegerPref(prefs::kTouchpadSpeedFactor, 9);
   prefs->RegisterIntegerPref(prefs::kTouchpadSensitivity, 5);
-  prefs->RegisterStringPref(prefs::kLanguageCurrentInputMethod, L"");
-  prefs->RegisterStringPref(prefs::kLanguagePreviousInputMethod, L"");
+  prefs->RegisterStringPref(prefs::kLanguageCurrentInputMethod, "");
+  prefs->RegisterStringPref(prefs::kLanguagePreviousInputMethod, "");
   prefs->RegisterStringPref(prefs::kLanguageHotkeyNextEngineInMenu,
                             kHotkeyNextEngineInMenu);
   prefs->RegisterStringPref(prefs::kLanguageHotkeyPreviousEngine,
                             kHotkeyPreviousEngine);
   prefs->RegisterStringPref(prefs::kLanguagePreloadEngines,
-                            UTF8ToWide(kFallbackInputMethodId));  // EN layout
+                            kFallbackInputMethodId);  // EN layout
   for (size_t i = 0; i < kNumChewingBooleanPrefs; ++i) {
     prefs->RegisterBooleanPref(kChewingBooleanPrefs[i].pref_name,
                                kChewingBooleanPrefs[i].default_pref_value);
@@ -40,7 +40,7 @@ void Preferences::RegisterUserPrefs(PrefService* prefs) {
   for (size_t i = 0; i < kNumChewingMultipleChoicePrefs; ++i) {
     prefs->RegisterStringPref(
         kChewingMultipleChoicePrefs[i].pref_name,
-        UTF8ToWide(kChewingMultipleChoicePrefs[i].default_pref_value));
+        kChewingMultipleChoicePrefs[i].default_pref_value);
   }
   prefs->RegisterIntegerPref(kChewingHsuSelKeyType.pref_name,
                              kChewingHsuSelKeyType.default_pref_value);
@@ -49,8 +49,9 @@ void Preferences::RegisterUserPrefs(PrefService* prefs) {
     prefs->RegisterIntegerPref(kChewingIntegerPrefs[i].pref_name,
                                kChewingIntegerPrefs[i].default_pref_value);
   }
-  prefs->RegisterStringPref(prefs::kLanguageHangulKeyboard,
-                            kHangulKeyboardNameIDPairs[0].keyboard_id);
+  prefs->RegisterStringPref(
+      prefs::kLanguageHangulKeyboard,
+      WideToUTF8(kHangulKeyboardNameIDPairs[0].keyboard_id));
   for (size_t i = 0; i < kNumPinyinBooleanPrefs; ++i) {
     prefs->RegisterBooleanPref(kPinyinBooleanPrefs[i].pref_name,
                                kPinyinBooleanPrefs[i].default_pref_value);
@@ -69,7 +70,7 @@ void Preferences::RegisterUserPrefs(PrefService* prefs) {
   for (size_t i = 0; i < kNumMozcMultipleChoicePrefs; ++i) {
     prefs->RegisterStringPref(
         kMozcMultipleChoicePrefs[i].pref_name,
-        UTF8ToWide(kMozcMultipleChoicePrefs[i].default_pref_value));
+        kMozcMultipleChoicePrefs[i].default_pref_value);
   }
 }
 
diff --git a/chrome/browser/download/download_manager.cc b/chrome/browser/download/download_manager.cc
index 63bb557..81ac6cb 100644
--- a/chrome/browser/download/download_manager.cc
+++ b/chrome/browser/download/download_manager.cc
@@ -307,7 +307,7 @@ FilePath DownloadItem::GetFileName() const {
 // static
 void DownloadManager::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterBooleanPref(prefs::kPromptForDownload, false);
-  prefs->RegisterStringPref(prefs::kDownloadExtensionsToOpen, L"");
+  prefs->RegisterStringPref(prefs::kDownloadExtensionsToOpen, "");
   prefs->RegisterBooleanPref(prefs::kDownloadDirUpgraded, false);
 
   // The default download path is userprofile\download.
diff --git a/chrome/browser/extensions/extension_updater.cc b/chrome/browser/extensions/extension_updater.cc
index 505796e..f4a0443 100644
--- a/chrome/browser/extensions/extension_updater.cc
+++ b/chrome/browser/extensions/extension_updater.cc
@@ -346,7 +346,7 @@ static void EnsureInt64PrefRegistered(PrefService* prefs,
 
 static void EnsureBlacklistVersionPrefRegistered(PrefService* prefs) {
   if (!prefs->FindPreference(kExtensionBlacklistUpdateVersion))
-    prefs->RegisterStringPref(kExtensionBlacklistUpdateVersion, L"0");
+    prefs->RegisterStringPref(kExtensionBlacklistUpdateVersion, "0");
 }
 
 // The overall goal here is to balance keeping clients up to date while
diff --git a/chrome/browser/extensions/extension_updater_unittest.cc b/chrome/browser/extensions/extension_updater_unittest.cc
index 20e745a..78fbbf3 100644
--- a/chrome/browser/extensions/extension_updater_unittest.cc
+++ b/chrome/browser/extensions/extension_updater_unittest.cc
@@ -599,7 +599,7 @@ class ExtensionUpdaterTest : public testing::Test {
         new ExtensionUpdater(&service, service.pref_service(),
                              kUpdateFrequencySecs);
     service.pref_service()->
-      RegisterStringPref(prefs::kExtensionBlacklistUpdateVersion, L"0");
+      RegisterStringPref(prefs::kExtensionBlacklistUpdateVersion, "0");
     GURL test_url("http://localhost/extension.crx");
 
     std::string id = "com.google.crx.blacklist";
diff --git a/chrome/browser/google_url_tracker.cc b/chrome/browser/google_url_tracker.cc
index 2dc32e1..07748ce 100644
--- a/chrome/browser/google_url_tracker.cc
+++ b/chrome/browser/google_url_tracker.cc
@@ -63,7 +63,7 @@ void GoogleURLTracker::RequestServerCheck() {
 // static
 void GoogleURLTracker::RegisterPrefs(PrefService* prefs) {
   prefs->RegisterStringPref(prefs::kLastKnownGoogleURL,
-                            ASCIIToWide(kDefaultGoogleHomepage));
+                            kDefaultGoogleHomepage);
 }
 
 // static
diff --git a/chrome/browser/intranet_redirect_detector.cc b/chrome/browser/intranet_redirect_detector.cc
index a3222b7..89f2f22 100644
--- a/chrome/browser/intranet_redirect_detector.cc
+++ b/chrome/browser/intranet_redirect_detector.cc
@@ -55,7 +55,7 @@ GURL IntranetRedirectDetector::RedirectOrigin() {
 // static
 void IntranetRedirectDetector::RegisterPrefs(PrefService* prefs) {
   prefs->RegisterStringPref(prefs::kLastKnownIntranetRedirectOrigin,
-                            std::wstring());
+                            std::string());
 }
 
 void IntranetRedirectDetector::FinishSleep() {
diff --git a/chrome/browser/managed_prefs_banner_base_unittest.cc b/chrome/browser/managed_prefs_banner_base_unittest.cc
index d11bbc1..6343bf5 100644
--- a/chrome/browser/managed_prefs_banner_base_unittest.cc
+++ b/chrome/browser/managed_prefs_banner_base_unittest.cc
@@ -19,7 +19,7 @@ class ManagedPrefsBannerBaseTest : public testing::Test {
     default_prefs_ = new DummyPrefStore;
     pref_service_.reset(new PrefService(
         new PrefValueStore(managed_prefs_, user_prefs_, default_prefs_)));
-    pref_service_->RegisterStringPref(prefs::kHomePage, L"http://google.com");
+    pref_service_->RegisterStringPref(prefs::kHomePage, "http://google.com");
     pref_service_->RegisterBooleanPref(prefs::kHomePageIsNewTabPage, false);
   }
 
diff --git a/chrome/browser/metrics/metrics_service.cc b/chrome/browser/metrics/metrics_service.cc
index 1d5673a..21c1789 100644
--- a/chrome/browser/metrics/metrics_service.cc
+++ b/chrome/browser/metrics/metrics_service.cc
@@ -326,11 +326,11 @@ class MetricsService::InitTask : public Task {
 // static
 void MetricsService::RegisterPrefs(PrefService* local_state) {
   DCHECK(IsSingleThreaded());
-  local_state->RegisterStringPref(prefs::kMetricsClientID, L"");
+  local_state->RegisterStringPref(prefs::kMetricsClientID, "");
   local_state->RegisterInt64Pref(prefs::kMetricsClientIDTimestamp, 0);
   local_state->RegisterInt64Pref(prefs::kStabilityLaunchTimeSec, 0);
   local_state->RegisterInt64Pref(prefs::kStabilityLastTimestampSec, 0);
-  local_state->RegisterStringPref(prefs::kStabilityStatsVersion, L"");
+  local_state->RegisterStringPref(prefs::kStabilityStatsVersion, "");
   local_state->RegisterInt64Pref(prefs::kStabilityStatsBuildTime, 0);
   local_state->RegisterBooleanPref(prefs::kStabilityExitedCleanly, true);
   local_state->RegisterBooleanPref(prefs::kStabilitySessionEndCompleted, true);
diff --git a/chrome/browser/net/chrome_url_request_context.cc b/chrome/browser/net/chrome_url_request_context.cc
index 93cc09b..5beaa65 100644
--- a/chrome/browser/net/chrome_url_request_context.cc
+++ b/chrome/browser/net/chrome_url_request_context.cc
@@ -550,9 +550,9 @@ void ChromeURLRequestContextGetter::RegisterUserPrefs(
     PrefService* pref_service) {
   pref_service->RegisterBooleanPref(prefs::kNoProxyServer, false);
   pref_service->RegisterBooleanPref(prefs::kProxyAutoDetect, false);
-  pref_service->RegisterStringPref(prefs::kProxyServer, L"");
-  pref_service->RegisterStringPref(prefs::kProxyPacUrl, L"");
-  pref_service->RegisterStringPref(prefs::kProxyBypassList, L"");
+  pref_service->RegisterStringPref(prefs::kProxyServer, "");
+  pref_service->RegisterStringPref(prefs::kProxyPacUrl, "");
+  pref_service->RegisterStringPref(prefs::kProxyBypassList, "");
 }
 
 net::CookieStore* ChromeURLRequestContextGetter::GetCookieStore() {
diff --git a/chrome/browser/pref_member_unittest.cc b/chrome/browser/pref_member_unittest.cc
index c301ef6..4b19513 100644
--- a/chrome/browser/pref_member_unittest.cc
+++ b/chrome/browser/pref_member_unittest.cc
@@ -21,7 +21,7 @@ void RegisterTestPrefs(PrefService* prefs) {
   prefs->RegisterBooleanPref(kBoolPref, false);
   prefs->RegisterIntegerPref(kIntPref, 0);
   prefs->RegisterRealPref(kRealPref, 0.0);
-  prefs->RegisterStringPref(kStringPref, L"default");
+  prefs->RegisterStringPref(kStringPref, "default");
 }
 
 class PrefMemberTestClass : public NotificationObserver {
diff --git a/chrome/browser/pref_service.cc b/chrome/browser/pref_service.cc
index bb80c90..506349e 100644
--- a/chrome/browser/pref_service.cc
+++ b/chrome/browser/pref_service.cc
@@ -214,7 +214,7 @@ void PrefService::RegisterRealPref(const wchar_t* path,
 }
 
 void PrefService::RegisterStringPref(const wchar_t* path,
-                                     const std::wstring& default_value) {
+                                     const std::string& default_value) {
   Preference* pref = new Preference(pref_value_store_.get(), path,
       Value::CreateStringValue(default_value));
   RegisterPreference(pref);
diff --git a/chrome/browser/pref_service.h b/chrome/browser/pref_service.h
index 5247e83..6b83d04 100644
--- a/chrome/browser/pref_service.h
+++ b/chrome/browser/pref_service.h
@@ -99,7 +99,7 @@ class PrefService : public NonThreadSafe {
   void RegisterRealPref(const wchar_t* path,
                         double default_value);
   void RegisterStringPref(const wchar_t* path,
-                          const std::wstring& default_value);
+                          const std::string& default_value);
   void RegisterFilePathPref(const wchar_t* path,
                             const FilePath& default_value);
   void RegisterListPref(const wchar_t* path);
diff --git a/chrome/browser/pref_service_unittest.cc b/chrome/browser/pref_service_unittest.cc
index 49ac729..fe97b13 100644
--- a/chrome/browser/pref_service_unittest.cc
+++ b/chrome/browser/pref_service_unittest.cc
@@ -89,7 +89,7 @@ TEST(PrefServiceTest, NoObserverFire) {
   PrefService prefs(new PrefValueStore(NULL, new DummyPrefStore(), NULL));
 
   const wchar_t pref_name[] = L"homepage";
-  prefs.RegisterStringPref(pref_name, L"");
+  prefs.RegisterStringPref(pref_name, "");
 
   const std::wstring new_pref_value(L"http://www.google.com/");
   TestPrefObserver obs(&prefs, pref_name, new_pref_value);
@@ -130,7 +130,7 @@ TEST(PrefServiceTest, HasPrefPath) {
 
   // Register the path. This doesn't set a value, so the path still shouldn't
   // exist.
-  prefs.RegisterStringPref(path, std::wstring());
+  prefs.RegisterStringPref(path, std::string());
   EXPECT_FALSE(prefs.HasPrefPath(path));
 
   // Set a value and make sure we have a path.
@@ -146,7 +146,7 @@ TEST(PrefServiceTest, Observers) {
   DummyPrefStore* pref_store = new DummyPrefStore();
   pref_store->set_prefs(dict);
   PrefService prefs(new PrefValueStore(NULL, pref_store, NULL));
-  prefs.RegisterStringPref(pref_name, L"");
+  prefs.RegisterStringPref(pref_name, "");
 
   const std::wstring new_pref_value(L"http://www.google.com/");
   TestPrefObserver obs(&prefs, pref_name, new_pref_value);
@@ -210,7 +210,7 @@ const wchar_t PrefServiceSetValueTest::name_[] = L"name";
 const wchar_t PrefServiceSetValueTest::value_[] = L"value";
 
 TEST_F(PrefServiceSetValueTest, SetStringValue) {
-  const wchar_t default_string[] = L"default";
+  const char default_string[] = "default";
   scoped_ptr<Value> default_value(Value::CreateStringValue(default_string));
   prefs_.RegisterStringPref(name_, default_string);
   prefs_.AddPrefObserver(name_, &observer_);
diff --git a/chrome/browser/printing/print_dialog_cloud.cc b/chrome/browser/printing/print_dialog_cloud.cc
index 796a81d..a5f3017 100644
--- a/chrome/browser/printing/print_dialog_cloud.cc
+++ b/chrome/browser/printing/print_dialog_cloud.cc
@@ -98,13 +98,13 @@
 
 namespace internal_cloud_print_helpers {
 
+const char kDefaultCloudPrintServiceURL[] = "https://www.google.com/cloudprint";
+
 void CloudPrintService::RegisterPreferences() {
   DCHECK(profile_);
   PrefService* pref_service = profile_->GetPrefs();
   if (pref_service->FindPreference(prefs::kCloudPrintServiceURL))
     return;
-  std::wstring kDefaultCloudPrintServiceURL(
-      L"https://www.google.com/cloudprint");
   pref_service->RegisterStringPref(prefs::kCloudPrintServiceURL,
                                    kDefaultCloudPrintServiceURL);
 }
diff --git a/chrome/browser/profile.cc b/chrome/browser/profile.cc
index 15ef278..bbfd60d 100644
--- a/chrome/browser/profile.cc
+++ b/chrome/browser/profile.cc
@@ -259,13 +259,13 @@ void Profile::RegisterUserPrefs(PrefService* prefs) {
 #endif
   prefs->RegisterFilePathPref(prefs::kCurrentThemePackFilename, FilePath());
   prefs->RegisterStringPref(prefs::kCurrentThemeID,
-                            UTF8ToWide(BrowserThemeProvider::kDefaultThemeID));
+                            BrowserThemeProvider::kDefaultThemeID);
   prefs->RegisterDictionaryPref(prefs::kCurrentThemeImages);
   prefs->RegisterDictionaryPref(prefs::kCurrentThemeColors);
   prefs->RegisterDictionaryPref(prefs::kCurrentThemeTints);
   prefs->RegisterDictionaryPref(prefs::kCurrentThemeDisplayProperties);
   prefs->RegisterBooleanPref(prefs::kDisableExtensions, false);
-  prefs->RegisterStringPref(prefs::kSelectFileLastDirectory, L"");
+  prefs->RegisterStringPref(prefs::kSelectFileLastDirectory, "");
 }
 
 // static
diff --git a/chrome/browser/safe_browsing/safe_browsing_service.cc b/chrome/browser/safe_browsing/safe_browsing_service.cc
index d51233b..b0320e9 100644
--- a/chrome/browser/safe_browsing/safe_browsing_service.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_service.cc
@@ -272,8 +272,8 @@ void SafeBrowsingService::OnEnable(bool enabled) {
 
 // static
 void SafeBrowsingService::RegisterPrefs(PrefService* prefs) {
-  prefs->RegisterStringPref(prefs::kSafeBrowsingClientKey, L"");
-  prefs->RegisterStringPref(prefs::kSafeBrowsingWrappedKey, L"");
+  prefs->RegisterStringPref(prefs::kSafeBrowsingClientKey, "");
+  prefs->RegisterStringPref(prefs::kSafeBrowsingWrappedKey, "");
 }
 
 void SafeBrowsingService::CloseDatabase() {
diff --git a/chrome/browser/search_engines/template_url_model.cc b/chrome/browser/search_engines/template_url_model.cc
index e12d891..1aa8f44 100644
--- a/chrome/browser/search_engines/template_url_model.cc
+++ b/chrome/browser/search_engines/template_url_model.cc
@@ -873,15 +873,15 @@ void TemplateURLModel::RegisterPrefs(PrefService* prefs) {
   if (prefs->FindPreference(prefs::kDefaultSearchProviderName))
     return;
   prefs->RegisterStringPref(
-      prefs::kDefaultSearchProviderName, std::wstring());
+      prefs::kDefaultSearchProviderName, std::string());
   prefs->RegisterStringPref(
-      prefs::kDefaultSearchProviderID, std::wstring());
+      prefs::kDefaultSearchProviderID, std::string());
   prefs->RegisterStringPref(
-      prefs::kDefaultSearchProviderPrepopulateID, std::wstring());
+      prefs::kDefaultSearchProviderPrepopulateID, std::string());
   prefs->RegisterStringPref(
-      prefs::kDefaultSearchProviderSuggestURL, std::wstring());
+      prefs::kDefaultSearchProviderSuggestURL, std::string());
   prefs->RegisterStringPref(
-      prefs::kDefaultSearchProviderSearchURL, std::wstring());
+      prefs::kDefaultSearchProviderSearchURL, std::string());
 }
 
 bool TemplateURLModel::CanReplaceKeywordForHost(
diff --git a/chrome/browser/sync/profile_sync_service_preference_unittest.cc b/chrome/browser/sync/profile_sync_service_preference_unittest.cc
index 542875f..92765b0 100644
--- a/chrome/browser/sync/profile_sync_service_preference_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_preference_unittest.cc
@@ -43,7 +43,7 @@ class ProfileSyncServicePreferenceTest
         example_url1_(L"http://example.com/1"),
         example_url2_(L"http://example.com/2"),
         not_synced_preference_name_(L"nonsense_pref_name"),
-        not_synced_preference_default_value_(L"default"),
+        not_synced_preference_default_value_("default"),
         non_default_charset_value_(L"foo") {}
 
   virtual void SetUp() {
@@ -192,7 +192,7 @@ class ProfileSyncServicePreferenceTest
   std::wstring example_url1_;
   std::wstring example_url2_;
   std::wstring not_synced_preference_name_;
-  std::wstring not_synced_preference_default_value_;
+  std::string not_synced_preference_default_value_;
   std::wstring non_default_charset_value_;
 };
 
diff --git a/chrome/browser/web_resource/web_resource_service.cc b/chrome/browser/web_resource/web_resource_service.cc
index a18804a..ac5dae6 100644
--- a/chrome/browser/web_resource/web_resource_service.cc
+++ b/chrome/browser/web_resource/web_resource_service.cc
@@ -50,7 +50,7 @@ class WebResourceService::WebResourceFetcher
       web_resource_service_->in_fetch_ = true;
 
     url_fetcher_.reset(new URLFetcher(GURL(
-        WideToUTF8(web_resource_service_->web_resource_server_)),
+        web_resource_service_->web_resource_server_),
         URLFetcher::GET, this));
     // Do not let url fetcher affect existing state in profile (by setting
     // cookies, for example.
@@ -179,13 +179,13 @@ class WebResourceService::UnpackerClient
 };
 
 // TODO(mirandac): replace these servers tomorrow!
-const wchar_t* WebResourceService::kDefaultResourceServer =
+const char* WebResourceService::kDefaultResourceServer =
 #if defined(OS_MACOSX)
-  L"https://clients2.google.com/tools/service/npredir?r=chrometips_mac&hl=";
+  "https://clients2.google.com/tools/service/npredir?r=chrometips_mac&hl=";
 #elif defined(OS_LINUX)
-  L"https://clients2.google.com/tools/service/npredir?r=chrometips_linux&hl=";
+  "https://clients2.google.com/tools/service/npredir?r=chrometips_linux&hl=";
 #else
-  L"https://clients2.google.com/tools/service/npredir?r=chrometips_win&hl=";
+  "https://clients2.google.com/tools/service/npredir?r=chrometips_win&hl=";
 #endif
 
 const char* WebResourceService::kResourceDirectoryName =
@@ -203,11 +203,12 @@ WebResourceService::~WebResourceService() { }
 void WebResourceService::Init() {
   resource_dispatcher_host_ = g_browser_process->resource_dispatcher_host();
   web_resource_fetcher_ = new WebResourceFetcher(this);
-  prefs_->RegisterStringPref(prefs::kNTPTipsCacheUpdate, L"0");
-  std::wstring locale = ASCIIToWide(g_browser_process->GetApplicationLocale());
+  prefs_->RegisterStringPref(prefs::kNTPTipsCacheUpdate, "0");
+  std::string locale = g_browser_process->GetApplicationLocale();
 
   if (prefs_->HasPrefPath(prefs::kNTPTipsServer)) {
-     web_resource_server_ = prefs_->GetString(prefs::kNTPTipsServer);
+     web_resource_server_ =
+         WideToASCII(prefs_->GetString(prefs::kNTPTipsServer));
      // If we are in the correct locale, initialization is done.
      if (EndsWith(web_resource_server_, locale, false))
        return;
@@ -293,5 +294,5 @@ void WebResourceService::UpdateResourceCache(const std::string& json_data) {
   // Update resource server and cache update time in preferences.
   prefs_->SetString(prefs::kNTPTipsCacheUpdate,
       DoubleToWString(base::Time::Now().ToDoubleT()));
-  prefs_->SetString(prefs::kNTPTipsServer, web_resource_server_);
+  prefs_->SetString(prefs::kNTPTipsServer, ASCIIToWide(web_resource_server_));
 }
diff --git a/chrome/browser/web_resource/web_resource_service.h b/chrome/browser/web_resource/web_resource_service.h
index b7c4980..6e26cd3 100644
--- a/chrome/browser/web_resource/web_resource_service.h
+++ b/chrome/browser/web_resource/web_resource_service.h
@@ -31,7 +31,7 @@ class WebResourceService
   static const wchar_t* kTipCachePrefName;
 
   // Default server from which to gather resources.
-  static const wchar_t* kDefaultResourceServer;
+  static const char* kDefaultResourceServer;
 
  private:
   class WebResourceFetcher;
@@ -56,7 +56,7 @@ class WebResourceService
   FilePath web_resource_dir_;
 
   // Server from which we are currently pulling web resource data.
-  std::wstring web_resource_server_;
+  std::string web_resource_server_;
 
   WebResourceFetcher* web_resource_fetcher_;
 
diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc
index 0809024..7c84ab7 100644
--- a/chrome_frame/test/net/fake_external_tab.cc
+++ b/chrome_frame/test/net/fake_external_tab.cc
@@ -225,7 +225,7 @@ void FakeExternalTab::Initialize() {
   WebCacheManager::RegisterPrefs(prefs);
 
   PrefService* local_state = browser_process_->local_state();
-  local_state->RegisterStringPref(prefs::kApplicationLocale, L"");
+  local_state->RegisterStringPref(prefs::kApplicationLocale, "");
   local_state->RegisterBooleanPref(prefs::kMetricsReportingEnabled, false);
 
   browser::RegisterLocalState(local_state);