Change a bunch of string types.

Started out just trying to change PrefService::GetString and ::SetString. This snowballed a little bit. Had to change a bunch of url strings in search_engines/ from wstring to string (some of them may be better off as GURLs, but UTF-8 is a step in the right direction, since that's what GURL uses internally, as well as externally via its setters/getters).

TODO (later patch): things that ask for accepted languages should use std::string, not std::wstring.

BUG=none
TEST=try bots

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

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

2 files changed, 6 insertions, 6 deletions

diff --git a/chrome/browser/metrics/metrics_log.cc b/chrome/browser/metrics/metrics_log.cc
index 219d686..abea0af 100644
--- a/chrome/browser/metrics/metrics_log.cc
+++ b/chrome/browser/metrics/metrics_log.cc
@@ -59,7 +59,7 @@ int64 MetricsLog::GetIncrementalUptime(PrefService* pref) {
 std::string MetricsLog::GetInstallDate() const {
   PrefService* pref = g_browser_process->local_state();
   if (pref) {
-    return WideToUTF8(pref->GetString(prefs::kMetricsClientIDTimestamp));
+    return pref->GetString(prefs::kMetricsClientIDTimestamp);
   } else {
     NOTREACHED();
     return "0";
diff --git a/chrome/browser/metrics/metrics_service.cc b/chrome/browser/metrics/metrics_service.cc
index c158226..64fdd67 100644
--- a/chrome/browser/metrics/metrics_service.cc
+++ b/chrome/browser/metrics/metrics_service.cc
@@ -455,14 +455,14 @@ void MetricsService::SetRecording(bool enabled) {
     if (client_id_.empty()) {
       PrefService* pref = g_browser_process->local_state();
       DCHECK(pref);
-      client_id_ = WideToUTF8(pref->GetString(prefs::kMetricsClientID));
+      client_id_ = pref->GetString(prefs::kMetricsClientID);
       if (client_id_.empty()) {
         client_id_ = GenerateClientID();
-        pref->SetString(prefs::kMetricsClientID, UTF8ToWide(client_id_));
+        pref->SetString(prefs::kMetricsClientID, client_id_);
 
         // Might as well make a note of how long this ID has existed
         pref->SetString(prefs::kMetricsClientIDTimestamp,
-                        Int64ToWString(Time::Now().ToTimeT()));
+                        Int64ToString(Time::Now().ToTimeT()));
       }
     }
     child_process_logging::SetClientId(client_id_);
@@ -667,13 +667,13 @@ void MetricsService::InitializeMetricsState() {
 
   if ((pref->GetInt64(prefs::kStabilityStatsBuildTime)
        != MetricsLog::GetBuildTime()) ||
-      (WideToUTF8(pref->GetString(prefs::kStabilityStatsVersion))
+      (pref->GetString(prefs::kStabilityStatsVersion)
        != MetricsLog::GetVersionString())) {
     // This is a new version, so we don't want to confuse the stats about the
     // old version with info that we upload.
     DiscardOldStabilityStats(pref);
     pref->SetString(prefs::kStabilityStatsVersion,
-                    UTF8ToWide(MetricsLog::GetVersionString()));
+                    MetricsLog::GetVersionString());
     pref->SetInt64(prefs::kStabilityStatsBuildTime,
                    MetricsLog::GetBuildTime());
   }