Remove wstring from l10n_util. Part 8, the last part....

chrome/browser/chromeos/login/wizard_controller_browsertest.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 "app/l10n_util.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/login/account_screen.h"
 #include "chrome/browser/chromeos/login/eula_view.h"
 #include "chrome/browser/chromeos/login/language_switch_menu.h"
 #include "chrome/browser/chromeos/login/login_screen.h"
 #include "chrome/browser/chromeos/login/mock_update_screen.h"
 #include "chrome/browser/chromeos/login/network_screen.h"
 #include "chrome/browser/chromeos/login/network_selection_view.h"
 #include "chrome/browser/chromeos/login/user_image_screen.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
@@ skipping 57 matching lines @@
   WizardController* const wizard = controller();
   ASSERT_TRUE(wizard != NULL);
   wizard->ShowFirstScreen(WizardController::kNetworkScreenName);
   views::View* current_screen = wizard->contents();
   ASSERT_TRUE(current_screen != NULL);
 
   // Checking the default locale. Provided that the profile is cleared in SetUp.
   EXPECT_EQ("en-US", g_browser_process->GetApplicationLocale());
   EXPECT_STREQ("en", icu::Locale::getDefault().getLanguage());
   EXPECT_FALSE(base::i18n::IsRTL());
-  const std::wstring en_str = l10n_util::GetString(IDS_NETWORK_SELECTION_TITLE);
+  const std::wstring en_str =
+      UTF16ToWide(l10n_util::GetStringUTF16(IDS_NETWORK_SELECTION_TITLE));
 
   chromeos::LanguageSwitchMenu::SwitchLanguage("fr");
   EXPECT_EQ("fr", g_browser_process->GetApplicationLocale());
   EXPECT_STREQ("fr", icu::Locale::getDefault().getLanguage());
   EXPECT_FALSE(base::i18n::IsRTL());
-  const std::wstring fr_str = l10n_util::GetString(IDS_NETWORK_SELECTION_TITLE);
+  const std::wstring fr_str =
+      UTF16ToWide(l10n_util::GetStringUTF16(IDS_NETWORK_SELECTION_TITLE));
 
   EXPECT_NE(en_str, fr_str);
 
   chromeos::LanguageSwitchMenu::SwitchLanguage("ar");
   EXPECT_EQ("ar", g_browser_process->GetApplicationLocale());
   EXPECT_STREQ("ar", icu::Locale::getDefault().getLanguage());
   EXPECT_TRUE(base::i18n::IsRTL());
-  const std::wstring ar_str = l10n_util::GetString(IDS_NETWORK_SELECTION_TITLE);
+  const std::wstring ar_str =
+      UTF16ToWide(l10n_util::GetStringUTF16(IDS_NETWORK_SELECTION_TITLE));
 
   EXPECT_NE(fr_str, ar_str);
 }
 
 class WizardControllerFlowTest : public WizardControllerTest {
  protected:
   WizardControllerFlowTest() {}
   // Overriden from InProcessBrowserTest:
   virtual Browser* CreateBrowser(Profile* profile) {
     Browser* ret = WizardControllerTest::CreateBrowser(profile);
@@ skipping 155 matching lines @@
   EXPECT_EQ(controller()->GetUserImageScreen(), controller()->current_screen());
 
   focus_manager = controller()->contents()->GetFocusManager();
   EXPECT_CALL(*mock_eula_screen_, Show()).Times(1);
   EXPECT_TRUE(focus_manager->ProcessAccelerator(accel_eula_screen));
   EXPECT_EQ(controller()->GetEulaScreen(), controller()->current_screen());
 }
 
 COMPILE_ASSERT(chromeos::ScreenObserver::EXIT_CODES_COUNT == 18,
                add_tests_for_new_control_flow_you_just_introduced);