Convert a bunch of wstring/wchar_t*'s, mostly in browser_about_handler.cc.

chrome/browser/sync/profile_sync_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/sync/profile_sync_service.h"
 
 #include <map>
 #include <set>
 
 #include "app/l10n_util.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/histogram.h"
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
+#include "base/string16.h"
 #include "base/string_util.h"
 #include "base/task.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/net/gaia/token_service.h"
 #include "chrome/browser/sync/engine/syncapi.h"
@@ skipping 520 matching lines @@
     SyncBackendHost::Status status =
         { SyncBackendHost::Status::OFFLINE_UNUSABLE };
     return status;
   }
 }
 
 bool ProfileSyncService::SetupInProgress() const {
   return !HasSyncSetupCompleted() && WizardIsVisible();
 }
 
-std::wstring ProfileSyncService::BuildSyncStatusSummaryText(
+std::string ProfileSyncService::BuildSyncStatusSummaryText(
   const sync_api::SyncManager::Status::Summary& summary) {
   switch (summary) {
     case sync_api::SyncManager::Status::OFFLINE:
-      return L"OFFLINE";
+      return "OFFLINE";
     case sync_api::SyncManager::Status::OFFLINE_UNSYNCED:
-      return L"OFFLINE_UNSYNCED";
+      return "OFFLINE_UNSYNCED";
     case sync_api::SyncManager::Status::SYNCING:
-      return L"SYNCING";
+      return "SYNCING";
     case sync_api::SyncManager::Status::READY:
-      return L"READY";
+      return "READY";
     case sync_api::SyncManager::Status::CONFLICT:
-      return L"CONFLICT";
+      return "CONFLICT";
     case sync_api::SyncManager::Status::OFFLINE_UNUSABLE:
-      return L"OFFLINE_UNUSABLE";
+      return "OFFLINE_UNUSABLE";
     case sync_api::SyncManager::Status::INVALID:  // fall through
     default:
-      return L"UNKNOWN";
+      return "UNKNOWN";
   }
 }
 
-std::wstring ProfileSyncService::GetLastSyncedTimeString() const {
+string16 ProfileSyncService::GetLastSyncedTimeString() const {
   if (last_synced_time_.is_null())
-    return l10n_util::GetString(IDS_SYNC_TIME_NEVER);
+    return l10n_util::GetStringUTF16(IDS_SYNC_TIME_NEVER);
 
   base::TimeDelta last_synced = base::Time::Now() - last_synced_time_;
 
   if (last_synced < base::TimeDelta::FromMinutes(1))
-    return l10n_util::GetString(IDS_SYNC_TIME_JUST_NOW);
+    return l10n_util::GetStringUTF16(IDS_SYNC_TIME_JUST_NOW);
 
-  return TimeFormat::TimeElapsed(last_synced);
+  return WideToUTF16Hack(TimeFormat::TimeElapsed(last_synced));
 }
 
 string16 ProfileSyncService::GetAuthenticatedUsername() const {
   if (backend_.get())
     return backend_->GetAuthenticatedUsername();
   else
     return string16();
 }
 
 void ProfileSyncService::OnUserSubmittedAuth(
@@ skipping 231 matching lines @@
   // is initialized, all enabled data types are consistent with one
   // another, and no unrecoverable error has transpired.
   if (unrecoverable_error_detected_)
     return false;
 
   if (!data_type_manager_.get())
     return false;
 
   return data_type_manager_->state() == DataTypeManager::CONFIGURED;
 }