Remove wstrings from bookmarks, part 12.

chrome/browser/views/clear_browsing_data.cc

-// Copyright (c) 2006-2008 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/browser/views/clear_browsing_data.h"
 
 #include "app/l10n_util.h"
+#include "base/string16.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/common/pref_names.h"
 #include "gfx/insets.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "net/url_request/url_request_context.h"
@@ skipping 312 matching lines @@
   return client_view;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ClearBrowsingDataView, ComboboxModel implementation:
 
 int ClearBrowsingDataView::GetItemCount() {
   return 5;
 }
 
-std::wstring ClearBrowsingDataView::GetItemAt(int index) {
+string16 ClearBrowsingDataView::GetItemAt(int index) {
   switch (index) {
-    case 0: return l10n_util::GetString(IDS_CLEAR_DATA_HOUR);
-    case 1: return l10n_util::GetString(IDS_CLEAR_DATA_DAY);
-    case 2: return l10n_util::GetString(IDS_CLEAR_DATA_WEEK);
-    case 3: return l10n_util::GetString(IDS_CLEAR_DATA_4WEEKS);
-    case 4: return l10n_util::GetString(IDS_CLEAR_DATA_EVERYTHING);
-    default: NOTREACHED() << L"Missing item";
-             return L"?";
+    case 0: return l10n_util::GetStringUTF16(IDS_CLEAR_DATA_HOUR);
+    case 1: return l10n_util::GetStringUTF16(IDS_CLEAR_DATA_DAY);
+    case 2: return l10n_util::GetStringUTF16(IDS_CLEAR_DATA_WEEK);
+    case 3: return l10n_util::GetStringUTF16(IDS_CLEAR_DATA_4WEEKS);
+    case 4: return l10n_util::GetStringUTF16(IDS_CLEAR_DATA_EVERYTHING);
+    default: NOTREACHED() << "Missing item";
+             return ASCIIToUTF16("?");
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ClearBrowsingDataView, views::ComboBoxListener implementation:
 
 void ClearBrowsingDataView::ItemChanged(views::Combobox* sender,
                                         int prev_index, int new_index) {
   if (sender == time_period_combobox_ && prev_index != new_index)
     profile_->GetPrefs()->SetInteger(prefs::kDeleteTimePeriod, new_index);
@@ skipping 103 matching lines @@
   remover_->AddObserver(this);
   remover_->Remove(remove_mask);
 }
 
 void ClearBrowsingDataView::OnBrowsingDataRemoverDone() {
   // No need to remove ourselves as an observer as BrowsingDataRemover deletes
   // itself after we return.
   remover_ = NULL;
   window()->Close();
 }