Remove wstring from l10n_util. Part 7....

chrome/browser/ui/views/local_storage_set_item_info_view.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/views/local_storage_set_item_info_view.h"
 
 #include <algorithm>
 
 #include "app/l10n_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 29 matching lines @@
 }
 
 void LocalStorageSetItemInfoView::EnableLocalStorageDisplay(bool enabled) {
   host_value_field_->SetEnabled(enabled);
   key_value_field_->SetEnabled(enabled);
   value_value_field_->SetEnabled(enabled);
 }
 
 void LocalStorageSetItemInfoView::ClearLocalStorageDisplay() {
   std::wstring no_cookie_string =
-      l10n_util::GetString(IDS_COOKIES_COOKIE_NONESELECTED);
+      UTF16ToWide(l10n_util::GetStringUTF16(IDS_COOKIES_COOKIE_NONESELECTED));
   host_value_field_->SetText(no_cookie_string);
   key_value_field_->SetText(no_cookie_string);
   value_value_field_->SetText(no_cookie_string);
   EnableLocalStorageDisplay(false);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // LocalStorageSetItemInfoView, views::View overrides:
 
 void LocalStorageSetItemInfoView::ViewHierarchyChanged(
     bool is_add, views::View* parent, views::View* child) {
   if (is_add && child == this)
     Init();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // LocalStorageSetItemInfoView, private:
 
 void LocalStorageSetItemInfoView::Init() {
   SkColor border_color = color_utils::GetSysSkColor(COLOR_3DSHADOW);
   views::Border* border = views::Border::CreateSolidBorder(
       kLocalStorageSetItemInfoViewBorderSize, border_color);
   set_border(border);
 
   // TODO(jorlow): These strings are not quite right, but we're post-freeze.
-  views::Label* host_label = new views::Label(
-      l10n_util::GetString(IDS_COOKIES_COOKIE_DOMAIN_LABEL));
+  // http://crbug.com/68688

[Evan Martin, 2011/01/06 19:48:28]

Nice catch!

+  views::Label* host_label = new views::Label(UTF16ToWide(
+      l10n_util::GetStringUTF16(IDS_COOKIES_COOKIE_DOMAIN_LABEL)));
   host_value_field_ = new views::Textfield;
-  views::Label* key_label = new views::Label(
-      l10n_util::GetString(IDS_COOKIES_LOCAL_STORAGE_KEY_LABEL));
+  views::Label* key_label = new views::Label(UTF16ToWide(
+      l10n_util::GetStringUTF16(IDS_COOKIES_LOCAL_STORAGE_KEY_LABEL)));
   key_value_field_ = new views::Textfield;
-  views::Label* value_label = new views::Label(
-      l10n_util::GetString(IDS_COOKIES_LOCAL_STORAGE_VALUE_LABEL));
+  views::Label* value_label = new views::Label(UTF16ToWide(
+      l10n_util::GetStringUTF16(IDS_COOKIES_LOCAL_STORAGE_VALUE_LABEL)));
   value_value_field_ = new views::Textfield;
 
   using views::GridLayout;
 
   GridLayout* layout = new GridLayout(this);
   layout->SetInsets(kLocalStorageSetItemInfoViewInsetSize,
                     kLocalStorageSetItemInfoViewInsetSize,
                     kLocalStorageSetItemInfoViewInsetSize,
                     kLocalStorageSetItemInfoViewInsetSize);
   SetLayoutManager(layout);
@@ skipping 24 matching lines @@
   host_value_field_->SetReadOnly(true);
   host_value_field_->RemoveBorder();
   host_value_field_->SetBackgroundColor(text_area_background);
   key_value_field_->SetReadOnly(true);
   key_value_field_->RemoveBorder();
   key_value_field_->SetBackgroundColor(text_area_background);
   value_value_field_->SetReadOnly(true);
   value_value_field_->RemoveBorder();
   value_value_field_->SetBackgroundColor(text_area_background);
 }