Remove wstrings from bookmarks, part 12.

chrome/browser/chromeos/login/network_screen_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 <string>
 
 #include "app/combobox_model.h"
 #include "app/l10n_util.h"
 #include "base/message_loop.h"
 #include "base/scoped_ptr.h"
+#include "base/string16.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/mock_login_library.h"
 #include "chrome/browser/chromeos/cros/mock_network_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/login/network_selection_view.h"
 #include "chrome/browser/chromeos/login/network_screen.h"
 #include "chrome/browser/chromeos/login/mock_screen_observer.h"
 #include "chrome/browser/chromeos/login/view_screen.h"
@@ skipping 19 matching lines @@
 class DummyButtonListener : public views::ButtonListener {
  public:
   virtual void ButtonPressed(views::Button* sender,
                              const views::Event& event) {}
 };
 
 class DummyComboboxModel : public ComboboxModel {
  public:
   virtual int GetItemCount() { return 2; }
 
-  virtual std::wstring GetItemAt(int index) {
-    return L"Item " + UTF16ToWideHack(base::IntToString16(index));
+  virtual string16 GetItemAt(int index) {
+    return ASCIIToUTF16("Item ") + base::IntToString16(index);
   }
 };
 
 class NetworkScreenTest : public WizardInProcessBrowserTest {
  public:
   NetworkScreenTest(): WizardInProcessBrowserTest("network"),
                        mock_login_library_(NULL),
                        mock_network_library_(NULL) {
     cellular_.set_name("Cellular network");
     wifi_.set_name("WiFi network");
@@ skipping 139 matching lines @@
 
 IN_PROC_BROWSER_TEST_F(NetworkScreenTest, Basic) {
   ASSERT_TRUE(controller());
   NetworkScreen* network_screen = controller()->GetNetworkScreen();
   ASSERT_TRUE(network_screen != NULL);
   ASSERT_EQ(network_screen, controller()->current_screen());
 
   NetworkSelectionView* network_view = network_screen->view();
   ASSERT_TRUE(network_view != NULL);
   ASSERT_EQ(1, network_screen->GetItemCount());
-  EXPECT_EQ(l10n_util::GetString(IDS_STATUSBAR_NO_NETWORKS_MESSAGE),
+  EXPECT_EQ(l10n_util::GetStringUTF16(IDS_STATUSBAR_NO_NETWORKS_MESSAGE),
             network_screen->GetItemAt(0));
 }
 
 IN_PROC_BROWSER_TEST_F(NetworkScreenTest, EnableWifi) {
   ASSERT_TRUE(controller());
   NetworkScreen* network_screen = controller()->GetNetworkScreen();
   ASSERT_TRUE(network_screen != NULL);
   ASSERT_EQ(network_screen, controller()->current_screen());
   NetworkSelectionView* network_view = network_screen->view();
   ASSERT_TRUE(network_view != NULL);
   NetworkLibrary* network_library =
        chromeos::CrosLibrary::Get()->GetNetworkLibrary();
 
   // WiFi is disabled.
   NetworkChangedExpectations(false);
   EthernetExpectations(false, false);
   WifiCellularNetworksExpectations();
   network_screen->NetworkChanged(network_library);
   ASSERT_EQ(2, network_screen->GetItemCount());
-  EXPECT_EQ(l10n_util::GetString(IDS_STATUSBAR_NO_NETWORKS_MESSAGE),
+  EXPECT_EQ(l10n_util::GetStringUTF16(IDS_STATUSBAR_NO_NETWORKS_MESSAGE),
             network_screen->GetItemAt(0));
-  EXPECT_EQ(l10n_util::GetStringF(IDS_STATUSBAR_NETWORK_DEVICE_ENABLE,
-                l10n_util::GetString(IDS_STATUSBAR_NETWORK_DEVICE_WIFI)),
+  EXPECT_EQ(l10n_util::GetStringFUTF16(IDS_STATUSBAR_NETWORK_DEVICE_ENABLE,
+                l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_DEVICE_WIFI)),
             network_screen->GetItemAt(1));
 
   // Emulate "Enable Wifi" item press.
   EXPECT_CALL(*mock_network_library_, EnableWifiNetworkDevice(true))
       .Times(1);
   DummyComboboxModel combobox_model;
   views::Combobox combobox(&combobox_model);
   network_screen->ItemChanged(&combobox, 0, 1);
   network_view->SetSelectedNetworkItem(1);
   ui_test_utils::RunAllPendingInMessageLoop();
@@ skipping 10 matching lines @@
   ASSERT_TRUE(network_view != NULL);
 
   EthernetExpectations(true, false);
   WifiCellularNetworksExpectations();
   NetworkChangedExpectations(true);
   network_screen->NetworkChanged(network_library);
   // Ethernet is preselected once.
   EXPECT_EQ(1, network_view->GetSelectedNetworkItem());
   ASSERT_EQ(network_screen, controller()->current_screen());
   ASSERT_EQ(2, network_screen->GetItemCount());
-  EXPECT_EQ(l10n_util::GetString(IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET),
+  EXPECT_EQ(l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET),
             network_screen->GetItemAt(1));
 
   // Ethernet - disconnected, WiFi & Cellular - connected.
   EthernetExpectations(false, false);
   SetupWifiNetwork(true, false);
   WifiExpectations(true, false);
   SetupCellularNetwork(true, false);
   CellularExpectations(true, false);
   WifiCellularNetworksExpectations();
   WifiSsidExpectation(wifi_.name());
   CellularNameExpectation(cellular_.name());
   NetworkChangedExpectations(true);
   network_screen->NetworkChanged(network_library);
   ASSERT_EQ(network_screen, controller()->current_screen());
   ASSERT_EQ(3, network_screen->GetItemCount());
-  EXPECT_EQ(ASCIIToWide(wifi_.name()), network_screen->GetItemAt(1));
-  EXPECT_EQ(ASCIIToWide(cellular_.name()), network_screen->GetItemAt(2));
+  EXPECT_EQ(ASCIIToUTF16(wifi_.name()), network_screen->GetItemAt(1));
+  EXPECT_EQ(ASCIIToUTF16(cellular_.name()), network_screen->GetItemAt(2));
 
   // Ethernet, WiFi & Cellular - connected.
   EthernetExpectations(true, false);
   WifiExpectations(true, false);
   CellularExpectations(true, false);
   WifiCellularNetworksExpectations();
   WifiSsidExpectation(wifi_.name());
   CellularNameExpectation(cellular_.name());
   NetworkChangedExpectations(true);
   network_screen->NetworkChanged(network_library);
   ASSERT_EQ(network_screen, controller()->current_screen());
   ASSERT_EQ(4, network_screen->GetItemCount());
-  EXPECT_EQ(l10n_util::GetString(IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET),
+  EXPECT_EQ(l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET),
             network_screen->GetItemAt(1));
-  EXPECT_EQ(ASCIIToWide(wifi_.name()), network_screen->GetItemAt(2));
-  EXPECT_EQ(ASCIIToWide(cellular_.name()), network_screen->GetItemAt(3));
+  EXPECT_EQ(ASCIIToUTF16(wifi_.name()), network_screen->GetItemAt(2));
+  EXPECT_EQ(ASCIIToUTF16(cellular_.name()), network_screen->GetItemAt(3));
   // Ethernet is only preselected once.
   EXPECT_EQ(0, network_view->GetSelectedNetworkItem());
 }
 
 IN_PROC_BROWSER_TEST_F(NetworkScreenTest, EthernetSelected) {
   ASSERT_TRUE(controller());
   NetworkLibrary* network_library =
       chromeos::CrosLibrary::Get()->GetNetworkLibrary();
   NetworkScreen* network_screen = controller()->GetNetworkScreen();
   ASSERT_TRUE(network_screen != NULL);
   NetworkSelectionView* network_view = network_screen->view();
   ASSERT_TRUE(network_view != NULL);
 
   // Emulate connecting to Ethernet.
   EthernetExpectations(false, true);
   WifiCellularNetworksExpectations();
   NetworkChangedExpectations(true);
   network_screen->NetworkChanged(network_library);
   ASSERT_EQ(2, network_screen->GetItemCount());
-  EXPECT_EQ(l10n_util::GetString(IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET),
+  EXPECT_EQ(l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET),
             network_screen->GetItemAt(1));
   ASSERT_EQ(network_screen, controller()->current_screen());
 
   // Emulate combobox selection - nothing happens.
   DummyComboboxModel combobox_model;
   views::Combobox combobox(&combobox_model);
   network_screen->ItemChanged(&combobox, 0, 1);
   network_view->SetSelectedNetworkItem(1);
   ui_test_utils::RunAllPendingInMessageLoop();
   ASSERT_EQ(network_screen, controller()->current_screen());
@@ skipping 20 matching lines @@
   NetworkSelectionView* network_view = network_screen->view();
   ASSERT_TRUE(network_view != NULL);
 
   EthernetExpectations(false, false);
   SetupWifiNetwork(false, false);
   WifiCellularNetworksExpectations();
   WifiSsidExpectation(std::string());
   NetworkChangedExpectations(true);
   network_screen->NetworkChanged(network_library);
   ASSERT_EQ(2, network_screen->GetItemCount());
-  EXPECT_EQ(ASCIIToWide(wifi_.name()), network_screen->GetItemAt(1));
+  EXPECT_EQ(ASCIIToUTF16(wifi_.name()), network_screen->GetItemAt(1));
 
   DummyComboboxModel combobox_model;
   views::Combobox combobox(&combobox_model);
 
   // Emulate combobox selection.
   EthernetExpectations(false, false);
   WifiCellularNetworksExpectations();
   WifiSsidExpectation(std::string());
   network_screen->ItemChanged(&combobox, 0, 1);
   network_view->SetSelectedNetworkItem(1);
@@ skipping 40 matching lines @@
   NetworkSelectionView* network_view = network_screen->view();
   ASSERT_TRUE(network_view != NULL);
 
   EthernetExpectations(false, false);
   SetupCellularNetwork(false, false);
   WifiCellularNetworksExpectations();
   CellularNameExpectation(std::string());
   NetworkChangedExpectations(true);
   network_screen->NetworkChanged(network_library);
   ASSERT_EQ(2, network_screen->GetItemCount());
-  EXPECT_EQ(ASCIIToWide(cellular_.name()), network_screen->GetItemAt(1));
+  EXPECT_EQ(ASCIIToUTF16(cellular_.name()), network_screen->GetItemAt(1));
 
   DummyComboboxModel combobox_model;
   views::Combobox combobox(&combobox_model);
 
   // Emulate combobox selection.
   EthernetExpectations(false, false);
   WifiCellularNetworksExpectations();
   CellularNameExpectation(std::string());
   network_screen->ItemChanged(&combobox, 0, 1);
   network_view->SetSelectedNetworkItem(1);
@@ skipping 94 matching lines @@
   WifiExpectations(true, false);
   WifiCellularNetworksExpectations();
   WifiSsidExpectation(wifi_.name());
   NetworkChangedExpectations(true);
   network_screen->NetworkChanged(network_library);
   ui_test_utils::RunAllPendingInMessageLoop();
   controller()->set_observer(NULL);
 }
 
 }  // namespace chromeos