Remove wstring from autocomplete.

chrome/test/automation/automation_proxy_uitest.cc

 // Copyright (c) 2011 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/app_switches.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
@@ skipping 1366 matching lines @@
 
 // TODO(port): Need to port autocomplete_edit_proxy.* first.
 #if defined(OS_WIN) || defined(OS_LINUX)
 TEST_F(AutomationProxyTest, AutocompleteGetSetText) {
   scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser.get());
   scoped_refptr<AutocompleteEditProxy> edit(
       browser->GetAutocompleteEdit());
   ASSERT_TRUE(edit.get());
   EXPECT_TRUE(edit->is_valid());
-  const std::wstring text_to_set = L"Lollerskates";
-  std::wstring actual_text;
+  const string16 text_to_set = ASCIIToUTF16("Lollerskates");
+  string16 actual_text;
   EXPECT_TRUE(edit->SetText(text_to_set));
   EXPECT_TRUE(edit->GetText(&actual_text));
   EXPECT_EQ(text_to_set, actual_text);
   scoped_refptr<AutocompleteEditProxy> edit2(
       browser->GetAutocompleteEdit());
   EXPECT_TRUE(edit2->GetText(&actual_text));
   EXPECT_EQ(text_to_set, actual_text);
 }
 
 TEST_F(AutomationProxyTest, AutocompleteParallelProxy) {
   scoped_refptr<BrowserProxy> browser1(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser1.get());
   scoped_refptr<AutocompleteEditProxy> edit1(
       browser1->GetAutocompleteEdit());
   ASSERT_TRUE(edit1.get());
   EXPECT_TRUE(browser1->RunCommand(IDC_NEW_WINDOW));
   scoped_refptr<BrowserProxy> browser2(automation()->GetBrowserWindow(1));
   ASSERT_TRUE(browser2.get());
   scoped_refptr<AutocompleteEditProxy> edit2(
       browser2->GetAutocompleteEdit());
   ASSERT_TRUE(edit2.get());
   EXPECT_TRUE(browser2->GetTab(0)->WaitForTabToBeRestored(
       TestTimeouts::action_max_timeout_ms()));
-  const std::wstring text_to_set1 = L"Lollerskates";
-  const std::wstring text_to_set2 = L"Roflcopter";
-  std::wstring actual_text1, actual_text2;
+  const string16 text_to_set1 = ASCIIToUTF16("Lollerskates");
+  const string16 text_to_set2 = ASCIIToUTF16("Roflcopter");
+  string16 actual_text1, actual_text2;
   EXPECT_TRUE(edit1->SetText(text_to_set1));
   EXPECT_TRUE(edit2->SetText(text_to_set2));
   EXPECT_TRUE(edit1->GetText(&actual_text1));
   EXPECT_TRUE(edit2->GetText(&actual_text2));
   EXPECT_EQ(text_to_set1, actual_text1);
   EXPECT_EQ(text_to_set2, actual_text2);
 }
 
 #endif  // defined(OS_WIN) || defined(OS_LINUX)
 
 #if defined(OS_MACOSX)
 // Disabled, http://crbug.com/48601.
 #define AutocompleteMatchesTest DISABLED_AutocompleteMatchesTest
 #else
 // Flaky, http://crbug.com/19876.
 #define AutocompleteMatchesTest FLAKY_AutocompleteMatchesTest
 #endif
 TEST_F(AutomationProxyVisibleTest, AutocompleteMatchesTest) {
   scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser.get());
   scoped_refptr<AutocompleteEditProxy> edit(
       browser->GetAutocompleteEdit());
   ASSERT_TRUE(edit.get());
   EXPECT_TRUE(edit->is_valid());
   EXPECT_TRUE(browser->ApplyAccelerator(IDC_FOCUS_LOCATION));
   ASSERT_TRUE(edit->WaitForFocus());
-  EXPECT_TRUE(edit->SetText(L"Roflcopter"));
+  EXPECT_TRUE(edit->SetText(ASCIIToUTF16("Roflcopter")));
   EXPECT_TRUE(edit->WaitForQuery(TestTimeouts::action_max_timeout_ms()));
   bool query_in_progress;
   EXPECT_TRUE(edit->IsQueryInProgress(&query_in_progress));
   EXPECT_FALSE(query_in_progress);
   std::vector<AutocompleteMatchData> matches;
   EXPECT_TRUE(edit->GetAutocompleteMatches(&matches));
   EXPECT_FALSE(matches.empty());
 }
 
 // Flaky especially on Windows. See crbug.com/25039.
@@ skipping 54 matching lines @@
             ui::MessageBoxFlags::DIALOGBUTTON_CANCEL, button);
 
   // Click OK.
   EXPECT_TRUE(automation()->ClickAppModalDialogButton(
       ui::MessageBoxFlags::DIALOGBUTTON_OK));
   EXPECT_TRUE(automation()->GetShowingAppModalDialog(&modal_dialog_showing,
                                                      &button));
   EXPECT_FALSE(modal_dialog_showing);
   int result = -1;
   EXPECT_TRUE(tab->ExecuteAndExtractInt(
-      L"", L"window.domAutomationController.send(result);", &result));
+      std::wstring(),
+      L"window.domAutomationController.send(result);", &result));
   EXPECT_EQ(0, result);
 
   // Try again.
   ASSERT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS,
             tab->NavigateToURL(GURL(content)));
   EXPECT_TRUE(automation()->WaitForAppModalDialog());
   EXPECT_TRUE(automation()->GetShowingAppModalDialog(&modal_dialog_showing,
                                                      &button));
   EXPECT_TRUE(modal_dialog_showing);
   EXPECT_EQ(ui::MessageBoxFlags::DIALOGBUTTON_OK |
             ui::MessageBoxFlags::DIALOGBUTTON_CANCEL, button);
 
   // Click Cancel this time.
   EXPECT_TRUE(automation()->ClickAppModalDialogButton(
       ui::MessageBoxFlags::DIALOGBUTTON_CANCEL));
   EXPECT_TRUE(automation()->GetShowingAppModalDialog(&modal_dialog_showing,
                                                      &button));
   EXPECT_FALSE(modal_dialog_showing);
   EXPECT_TRUE(tab->ExecuteAndExtractInt(
-      L"", L"window.domAutomationController.send(result);", &result));
+      std::wstring(),
+      L"window.domAutomationController.send(result);", &result));
   EXPECT_EQ(1, result);
 }
 
 class AutomationProxyTest5 : public UITest {
  protected:
   AutomationProxyTest5() {
     show_window_ = true;
     dom_automation_enabled_ = true;
     // We need to disable popup blocking to ensure that the RenderView
     // instance for the popup actually closes.
@@ skipping 202 matching lines @@
   int diff_pixels_count = 0;
   for (int x = 0; x < img_size.width(); ++x) {
     for (int y = 0; y < img_size.height(); ++y) {
       if (*snapshot_bmp.getAddr32(x, y) != *reference_bmp.getAddr32(x, y)) {
         ++diff_pixels_count;
       }
     }
   }
   ASSERT_EQ(diff_pixels_count, 0);
 }