Remove wstring from l10n_util. Part 7....

chrome/browser/ui/views/collected_cookies_win.cc

Index: chrome/browser/ui/views/collected_cookies_win.cc
===================================================================
--- chrome/browser/ui/views/collected_cookies_win.cc	(revision 70562)
+++ chrome/browser/ui/views/collected_cookies_win.cc	(working copy)
@@ -80,18 +80,21 @@
     std::wstring label;
     switch (setting) {
       case CONTENT_SETTING_BLOCK:
-        label = l10n_util::GetStringF(
-            IDS_COLLECTED_COOKIES_BLOCK_RULE_CREATED, domain_name);
+        label = UTF16ToWide(l10n_util::GetStringFUTF16(
+            IDS_COLLECTED_COOKIES_BLOCK_RULE_CREATED,
+            WideToUTF16(domain_name)));
         break;
 
       case CONTENT_SETTING_ALLOW:
-        label = l10n_util::GetStringF(
-            IDS_COLLECTED_COOKIES_ALLOW_RULE_CREATED, domain_name);
+        label = UTF16ToWide(l10n_util::GetStringFUTF16(
+            IDS_COLLECTED_COOKIES_ALLOW_RULE_CREATED,
+            WideToUTF16(domain_name)));
         break;
 
       case CONTENT_SETTING_SESSION_ONLY:
-        label = l10n_util::GetStringF(
-            IDS_COLLECTED_COOKIES_SESSION_RULE_CREATED, domain_name);
+        label = UTF16ToWide(l10n_util::GetStringFUTF16(
+            IDS_COLLECTED_COOKIES_SESSION_RULE_CREATED,
+            WideToUTF16(domain_name)));
         break;
 
       default:
@@ -186,8 +189,8 @@
       tab_contents_->profile()->GetHostContentSettingsMap();
 
   // Allowed Cookie list.
-  allowed_label_ = new views::Label(
-      l10n_util::GetString(IDS_COLLECTED_COOKIES_ALLOWED_COOKIES_LABEL));
+  allowed_label_ = new views::Label(UTF16ToWide(l10n_util::GetStringUTF16(
+      IDS_COLLECTED_COOKIES_ALLOWED_COOKIES_LABEL)));
   allowed_cookies_tree_model_.reset(
       content_settings->GetAllowedCookiesTreeModel());
   allowed_cookies_tree_ = new views::TreeView();
@@ -200,10 +203,10 @@
 
   // Blocked Cookie list.
   blocked_label_ = new views::Label(
-      l10n_util::GetString(
+      UTF16ToWide(l10n_util::GetStringUTF16(
           host_content_settings_map->BlockThirdPartyCookies() ?
               IDS_COLLECTED_COOKIES_BLOCKED_THIRD_PARTY_BLOCKING_ENABLED :
-              IDS_COLLECTED_COOKIES_BLOCKED_COOKIES_LABEL));
+              IDS_COLLECTED_COOKIES_BLOCKED_COOKIES_LABEL)));
   blocked_label_->SetMultiLine(true);
   blocked_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   blocked_cookies_tree_model_.reset(
@@ -245,8 +248,8 @@
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
 
   layout->StartRow(0, single_column_layout_id);
-  block_allowed_button_ = new views::NativeButton(
-      this, l10n_util::GetString(IDS_COLLECTED_COOKIES_BLOCK_BUTTON));
+  block_allowed_button_ = new views::NativeButton(this, UTF16ToWide(
+      l10n_util::GetStringUTF16(IDS_COLLECTED_COOKIES_BLOCK_BUTTON)));
   layout->AddView(
       block_allowed_button_, 1, 1, GridLayout::LEADING, GridLayout::CENTER);
   layout->AddPaddingRow(0, kUnrelatedControlVerticalSpacing);
@@ -267,11 +270,11 @@
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
 
   layout->StartRow(0, three_columns_layout_id);
-  allow_blocked_button_ = new views::NativeButton(
-      this, l10n_util::GetString(IDS_COLLECTED_COOKIES_ALLOW_BUTTON));
+  allow_blocked_button_ = new views::NativeButton(this, UTF16ToWide(
+      l10n_util::GetStringUTF16(IDS_COLLECTED_COOKIES_ALLOW_BUTTON)));
   layout->AddView(allow_blocked_button_);
-  for_session_blocked_button_ = new views::NativeButton(
-      this, l10n_util::GetString(IDS_COLLECTED_COOKIES_SESSION_ONLY_BUTTON));
+  for_session_blocked_button_ = new views::NativeButton(this, UTF16ToWide(
+      l10n_util::GetStringUTF16(IDS_COLLECTED_COOKIES_SESSION_ONLY_BUTTON)));
   layout->AddView(for_session_blocked_button_);
 
   layout->StartRow(0, single_column_layout_id);
@@ -285,7 +288,8 @@
 // ConstrainedDialogDelegate implementation.
 
 std::wstring CollectedCookiesWin::GetWindowTitle() const {
-  return l10n_util::GetString(IDS_COLLECTED_COOKIES_DIALOG_TITLE);
+  return UTF16ToWide(
+      l10n_util::GetStringUTF16(IDS_COLLECTED_COOKIES_DIALOG_TITLE));
 }
 
 int CollectedCookiesWin::GetDialogButtons() const {
@@ -294,7 +298,7 @@
 
 std::wstring CollectedCookiesWin::GetDialogButtonLabel(
     MessageBoxFlags::DialogButton button) const {
-  return l10n_util::GetString(IDS_CLOSE);
+  return UTF16ToWide(l10n_util::GetStringUTF16(IDS_CLOSE));
 }
 
 void CollectedCookiesWin::DeleteDelegate() {