Revert 72380 - Remove wstring from autocomplete....

chrome/browser/autocomplete/autocomplete_edit_view_browsertest.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 <stdio.h>
 
 #include "base/message_loop.h"
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/time.h"
@@ skipping 333 matching lines @@
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_2, true, false, false));
     ASSERT_EQ(1, browser()->selected_index());
 
     browser()->FocusLocationBar();
 
     // Try ctrl-w to close a Tab.
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_W, true, false, false));
     ASSERT_NO_FATAL_FAILURE(WaitForTabOpenOrClose(tab_count));
 
     // Try ctrl-l to focus location bar.
-    edit_view->SetUserText(ASCIIToUTF16("Hello world"));
+    edit_view->SetUserText(L"Hello world");
     EXPECT_FALSE(edit_view->IsSelectAll());
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_L, true, false, false));
     EXPECT_TRUE(edit_view->IsSelectAll());
 
     // Try editing the location bar text.
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_RIGHT, false, false, false));
     EXPECT_FALSE(edit_view->IsSelectAll());
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_S, false, false, false));
-    EXPECT_EQ(ASCIIToUTF16("Hello worlds"), edit_view->GetText());
+    EXPECT_EQ(L"Hello worlds", edit_view->GetText());
 
     // Try ctrl-x to cut text.
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_LEFT, true, true, false));
     EXPECT_FALSE(edit_view->IsSelectAll());
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_X, true, false, false));
-    EXPECT_EQ(ASCIIToUTF16("Hello "), edit_view->GetText());
+    EXPECT_EQ(L"Hello ", edit_view->GetText());
 
 #if !defined(OS_CHROMEOS)
     // Try alt-f4 to close the browser.
     ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait(
         browser(), ui::VKEY_F4, false, false, true, false,
         NotificationType::BROWSER_CLOSED, Source<Browser>(browser())));
 #endif
   }
 
   void PopupAcceleratorsTest() {
     // Create a popup.
     Browser* popup = CreateBrowserForPopup(browser()->profile());
     AutocompleteEditView* edit_view = NULL;
     ASSERT_NO_FATAL_FAILURE(
         GetAutocompleteEditViewForBrowser(popup, &edit_view));
     popup->FocusLocationBar();
     EXPECT_TRUE(edit_view->IsSelectAll());
 
     // Try ctrl-w to close the popup.
     ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait(
         popup, ui::VKEY_W, true, false, false, false,
         NotificationType::BROWSER_CLOSED, Source<Browser>(popup)));
 
     // Create another popup.
     popup = CreateBrowserForPopup(browser()->profile());
     ASSERT_NO_FATAL_FAILURE(
         GetAutocompleteEditViewForBrowser(popup, &edit_view));
 
     // Set the edit text to "Hello world".
-    edit_view->SetUserText(ASCIIToUTF16("Hello world"));
+    edit_view->SetUserText(L"Hello world");
     EXPECT_FALSE(edit_view->IsSelectAll());
     popup->FocusLocationBar();
     EXPECT_TRUE(edit_view->IsSelectAll());
 
     // Try editing the location bar text -- should be disallowed.
     ASSERT_NO_FATAL_FAILURE(SendKeyForBrowser(popup, ui::VKEY_RIGHT, false,
                                               false, false));
     EXPECT_FALSE(edit_view->IsSelectAll());
     ASSERT_NO_FATAL_FAILURE(SendKeyForBrowser(popup, ui::VKEY_S, false, false,
                                               false));
-    EXPECT_EQ(ASCIIToUTF16("Hello world"), edit_view->GetText());
+    EXPECT_EQ(L"Hello world", edit_view->GetText());
 
     // Try ctrl-x to cut text -- should be disallowed.
     ASSERT_NO_FATAL_FAILURE(SendKeyForBrowser(popup, ui::VKEY_LEFT, true, true,
                                               false));
     EXPECT_FALSE(edit_view->IsSelectAll());
     ASSERT_NO_FATAL_FAILURE(SendKeyForBrowser(popup, ui::VKEY_X, true, false,
                                               false));
-    EXPECT_EQ(ASCIIToUTF16("Hello world"), edit_view->GetText());
+    EXPECT_EQ(L"Hello world", edit_view->GetText());
 
 #if !defined(OS_CHROMEOS)
     // Try alt-f4 to close the popup.
     ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait(
         popup, ui::VKEY_F4, false, false, true, false,
         NotificationType::BROWSER_CLOSED, Source<Browser>(popup)));
 #endif
   }
 
   void BackspaceInKeywordModeTest() {
     AutocompleteEditView* edit_view = NULL;
     ASSERT_NO_FATAL_FAILURE(GetAutocompleteEditView(&edit_view));
 
     // Trigger keyword hint mode.
     ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchKeywordKeys));
     ASSERT_TRUE(edit_view->model()->is_keyword_hint());
-    ASSERT_EQ(kSearchKeyword, UTF16ToUTF8(edit_view->model()->keyword()));
+    ASSERT_EQ(kSearchKeyword, WideToUTF8(edit_view->model()->keyword()));
 
     // Trigger keyword mode.
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB, false, false, false));
     ASSERT_FALSE(edit_view->model()->is_keyword_hint());
-    ASSERT_EQ(kSearchKeyword, UTF16ToUTF8(edit_view->model()->keyword()));
+    ASSERT_EQ(kSearchKeyword, WideToUTF8(edit_view->model()->keyword()));
 
     // Backspace without search text should bring back keyword hint mode.
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_BACK, false, false, false));
     ASSERT_TRUE(edit_view->model()->is_keyword_hint());
-    ASSERT_EQ(kSearchKeyword, UTF16ToUTF8(edit_view->model()->keyword()));
+    ASSERT_EQ(kSearchKeyword, WideToUTF8(edit_view->model()->keyword()));
 
     // Trigger keyword mode again.
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB, false, false, false));
     ASSERT_FALSE(edit_view->model()->is_keyword_hint());
-    ASSERT_EQ(kSearchKeyword, UTF16ToUTF8(edit_view->model()->keyword()));
+    ASSERT_EQ(kSearchKeyword, WideToUTF8(edit_view->model()->keyword()));
 
     // Input something as search text.
     ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchTextKeys));
 
     // Should stay in keyword mode while deleting search text by pressing
     // backspace.
     for (size_t i = 0; i < arraysize(kSearchText) - 1; ++i) {
       ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_BACK, false, false, false));
       ASSERT_FALSE(edit_view->model()->is_keyword_hint());
-      ASSERT_EQ(kSearchKeyword, UTF16ToUTF8(edit_view->model()->keyword()));
+      ASSERT_EQ(kSearchKeyword, WideToUTF8(edit_view->model()->keyword()));
     }
 
     // Input something as search text.
     ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchTextKeys));
 
     // Move cursor to the beginning of the search text.
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_HOME, false, false, false));
     // Backspace at the beginning of the search text shall turn off
     // the keyword mode.
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_BACK, false, false, false));
     ASSERT_FALSE(edit_view->model()->is_keyword_hint());
-    ASSERT_EQ(string16(), edit_view->model()->keyword());
+    ASSERT_EQ(std::string(), WideToUTF8(edit_view->model()->keyword()));
     ASSERT_EQ(std::string(kSearchKeyword) + kSearchText,
-              UTF16ToUTF8(edit_view->GetText()));
+              WideToUTF8(edit_view->GetText()));
   }
 
   void EscapeTest() {
     ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIHistoryURL));
     browser()->FocusLocationBar();
 
     AutocompleteEditView* edit_view = NULL;
     ASSERT_NO_FATAL_FAILURE(GetAutocompleteEditView(&edit_view));
 
-    string16 old_text = edit_view->GetText();
+    std::wstring old_text = edit_view->GetText();
     EXPECT_FALSE(old_text.empty());
     EXPECT_TRUE(edit_view->IsSelectAll());
 
     // Delete all text in omnibox.
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_BACK, false, false, false));
     EXPECT_TRUE(edit_view->GetText().empty());
 
     // Escape shall revert the text in omnibox.
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_ESCAPE, false, false, false));
     EXPECT_EQ(old_text, edit_view->GetText());
     EXPECT_TRUE(edit_view->IsSelectAll());
   }
 
   void DesiredTLDTest() {
     AutocompleteEditView* edit_view = NULL;
     ASSERT_NO_FATAL_FAILURE(GetAutocompleteEditView(&edit_view));
     AutocompletePopupModel* popup_model = edit_view->model()->popup_model();
     ASSERT_TRUE(popup_model);
 
     // Test ctrl-Enter.
     ASSERT_NO_FATAL_FAILURE(SendKeySequence(kDesiredTLDKeys));
     ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone());
     ASSERT_TRUE(popup_model->IsOpen());
-    // ctrl-Enter triggers desired_tld feature, thus www.bar.com shall be
-    // opened.
+    // ctrl-Enter triggers desired_tld feature, thus www.bar.com shall be opened.
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_RETURN, true, false, false));
 
     GURL url = browser()->GetSelectedTabContents()->GetURL();
     EXPECT_STREQ(kDesiredTLDHostname, url.host().c_str());
   }
 
   void AltEnterTest() {
     AutocompleteEditView* edit_view = NULL;
     ASSERT_NO_FATAL_FAILURE(GetAutocompleteEditView(&edit_view));
 
-    edit_view->SetUserText(ASCIIToUTF16(chrome::kChromeUIHistoryURL));
+    edit_view->SetUserText(ASCIIToWide(chrome::kChromeUIHistoryURL));
     int tab_count = browser()->tab_count();
     // alt-Enter opens a new tab.
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_RETURN, false, false, true));
     ASSERT_NO_FATAL_FAILURE(WaitForTabOpenOrClose(tab_count + 1));
   }
 
   void EnterToSearchTest() {
     AutocompleteEditView* edit_view = NULL;
     ASSERT_NO_FATAL_FAILURE(GetAutocompleteEditView(&edit_view));
     AutocompletePopupModel* popup_model = edit_view->model()->popup_model();
@@ skipping 12 matching lines @@
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_RETURN, false, false, false));
     GURL url = browser()->GetSelectedTabContents()->GetURL();
     EXPECT_STREQ(kSearchTextURL, url.spec().c_str());
 
     // Test that entering a single character then Enter performs a search.
     browser()->FocusLocationBar();
     EXPECT_TRUE(edit_view->IsSelectAll());
     ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchSingleCharKeys));
     ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone());
     ASSERT_TRUE(popup_model->IsOpen());
-    EXPECT_EQ(kSearchSingleChar, UTF16ToUTF8(edit_view->GetText()));
+    EXPECT_EQ(kSearchSingleChar, WideToUTF8(edit_view->GetText()));
 
     // Check if the default match result is Search Primary Provider.
     ASSERT_EQ(AutocompleteMatch::SEARCH_WHAT_YOU_TYPED,
               popup_model->result().default_match()->type);
 
     // Open the default match.
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_RETURN, false, false, false));
     url = browser()->GetSelectedTabContents()->GetURL();
     EXPECT_STREQ(kSearchSingleCharURL, url.spec().c_str());
   }
 
   void EscapeToDefaultMatchTest() {
     AutocompleteEditView* edit_view = NULL;
     ASSERT_NO_FATAL_FAILURE(GetAutocompleteEditView(&edit_view));
     AutocompletePopupModel* popup_model = edit_view->model()->popup_model();
     ASSERT_TRUE(popup_model);
 
     // Input something to trigger inline autocomplete.
     ASSERT_NO_FATAL_FAILURE(SendKeySequence(kInlineAutocompleteTextKeys));
     ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone());
     ASSERT_TRUE(popup_model->IsOpen());
 
-    string16 old_text = edit_view->GetText();
+    std::wstring old_text = edit_view->GetText();
 
     // Make sure inline autocomplete is triggerred.
     EXPECT_GT(old_text.length(), arraysize(kInlineAutocompleteText) - 1);
 
     size_t old_selected_line = popup_model->selected_line();
     EXPECT_EQ(0U, old_selected_line);
 
     // Move to another line with different text.
     size_t size = popup_model->result().size();
     while (popup_model->selected_line() < size - 1) {
@@ skipping 11 matching lines @@
     EXPECT_EQ(old_selected_line, popup_model->selected_line());
   }
 
   void BasicTextOperationsTest() {
     ui_test_utils::NavigateToURL(browser(), GURL(chrome::kAboutBlankURL));
     browser()->FocusLocationBar();
 
     AutocompleteEditView* edit_view = NULL;
     ASSERT_NO_FATAL_FAILURE(GetAutocompleteEditView(&edit_view));
 
-    string16 old_text = edit_view->GetText();
-    EXPECT_EQ(UTF8ToUTF16(chrome::kAboutBlankURL), old_text);
+    std::wstring old_text = edit_view->GetText();
+    EXPECT_EQ(UTF8ToWide(chrome::kAboutBlankURL), old_text);
     EXPECT_TRUE(edit_view->IsSelectAll());
 
-    string16::size_type start, end;
+    std::wstring::size_type start, end;
     edit_view->GetSelectionBounds(&start, &end);
     EXPECT_EQ(0U, start);
     EXPECT_EQ(old_text.size(), end);
 
     // Move the cursor to the end.
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_END, false, false, false));
     EXPECT_FALSE(edit_view->IsSelectAll());
 
     // Make sure the cursor is placed correctly.
     edit_view->GetSelectionBounds(&start, &end);
     EXPECT_EQ(old_text.size(), start);
     EXPECT_EQ(old_text.size(), end);
 
     // Insert one character at the end. Make sure we won't insert
     // anything after the special ZWS mark used in gtk implementation.
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_A, false, false, false));
-    EXPECT_EQ(old_text + char16('a'), edit_view->GetText());
+    EXPECT_EQ(old_text + L"a", edit_view->GetText());
 
     // Delete one character from the end. Make sure we won't delete the special
     // ZWS mark used in gtk implementation.
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_BACK, false, false, false));
     EXPECT_EQ(old_text, edit_view->GetText());
 
     edit_view->SelectAll(true);
     EXPECT_TRUE(edit_view->IsSelectAll());
     edit_view->GetSelectionBounds(&start, &end);
     EXPECT_EQ(0U, start);
@@ skipping 13 matching lines @@
     EXPECT_EQ(old_text, edit_view->GetText());
     edit_view->GetSelectionBounds(&start, &end);
     EXPECT_EQ(old_text.size(), start);
     EXPECT_EQ(old_text.size(), end);
   }
 
   void AcceptKeywordBySpaceTest() {
     AutocompleteEditView* edit_view = NULL;
     ASSERT_NO_FATAL_FAILURE(GetAutocompleteEditView(&edit_view));
 
-    string16 text = UTF8ToUTF16(kSearchKeyword);
+    std::wstring text = UTF8ToWide(kSearchKeyword);
 
     // Trigger keyword hint mode.
     ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchKeywordKeys));
     ASSERT_TRUE(edit_view->model()->is_keyword_hint());
     ASSERT_EQ(text, edit_view->model()->keyword());
     ASSERT_EQ(text, edit_view->GetText());
 
     // Trigger keyword mode by space.
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_SPACE, false, false, false));
     ASSERT_FALSE(edit_view->model()->is_keyword_hint());
     ASSERT_EQ(text, edit_view->model()->keyword());
     ASSERT_TRUE(edit_view->GetText().empty());
 
     // Revert to keyword hint mode.
-    edit_view->model()->ClearKeyword(string16());
+    edit_view->model()->ClearKeyword(std::wstring());
     ASSERT_TRUE(edit_view->model()->is_keyword_hint());
     ASSERT_EQ(text, edit_view->model()->keyword());
     ASSERT_EQ(text, edit_view->GetText());
 
     // Keyword should also be accepted by typing an ideographic space.
     edit_view->OnBeforePossibleChange();
-    edit_view->SetWindowTextAndCaretPos(text + WideToUTF16(L"\x3000"),
-                                        text.length() + 1);
+    edit_view->SetWindowTextAndCaretPos(text + L"\x3000", text.length() + 1);
     edit_view->OnAfterPossibleChange();
     ASSERT_FALSE(edit_view->model()->is_keyword_hint());
     ASSERT_EQ(text, edit_view->model()->keyword());
     ASSERT_TRUE(edit_view->GetText().empty());
 
     // Revert to keyword hint mode.
-    edit_view->model()->ClearKeyword(string16());
+    edit_view->model()->ClearKeyword(std::wstring());
     ASSERT_TRUE(edit_view->model()->is_keyword_hint());
     ASSERT_EQ(text, edit_view->model()->keyword());
     ASSERT_EQ(text, edit_view->GetText());
 
     // Keyword shouldn't be accepted by pasting.
     // Simulate pasting a whitespace to the end of content.
     edit_view->OnBeforePossibleChange();
     edit_view->model()->on_paste();
-    edit_view->SetWindowTextAndCaretPos(text + char16(' '), text.length() + 1);
+    edit_view->SetWindowTextAndCaretPos(text + L" ", text.length() + 1);
     edit_view->OnAfterPossibleChange();
     // Should be still in keyword hint mode.
     ASSERT_TRUE(edit_view->model()->is_keyword_hint());
     ASSERT_EQ(text, edit_view->model()->keyword());
-    ASSERT_EQ(text + char16(' '), edit_view->GetText());
+    ASSERT_EQ(text + L" ", edit_view->GetText());
 
     // Keyword shouldn't be accepted by pressing space with a trailing
     // whitespace.
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_SPACE, false, false, false));
     ASSERT_TRUE(edit_view->model()->is_keyword_hint());
     ASSERT_EQ(text, edit_view->model()->keyword());
-    ASSERT_EQ(text + ASCIIToUTF16("  "), edit_view->GetText());
+    ASSERT_EQ(text + L"  ", edit_view->GetText());
 
     // Keyword shouldn't be accepted by deleting the trailing space.
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_BACK, false, false, false));
     ASSERT_TRUE(edit_view->model()->is_keyword_hint());
     ASSERT_EQ(text, edit_view->model()->keyword());
-    ASSERT_EQ(text + char16(' '), edit_view->GetText());
+    ASSERT_EQ(text + L" ", edit_view->GetText());
 
     // Keyword shouldn't be accepted by pressing space in the middle
     // of content.
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_LEFT, false, false, false));
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_SPACE, false, false, false));
     ASSERT_TRUE(edit_view->model()->is_keyword_hint());
     ASSERT_EQ(text, edit_view->model()->keyword());
-    ASSERT_EQ(text + ASCIIToUTF16("  "), edit_view->GetText());
+    ASSERT_EQ(text + L"  ", edit_view->GetText());
 
     // Keyword shouldn't be accepted by pasting "foo bar".
-    edit_view->SetUserText(string16());
+    edit_view->SetUserText(std::wstring());
     ASSERT_FALSE(edit_view->model()->is_keyword_hint());
     ASSERT_TRUE(edit_view->model()->keyword().empty());
 
     edit_view->OnBeforePossibleChange();
     edit_view->model()->on_paste();
-    edit_view->SetWindowTextAndCaretPos(text + ASCIIToUTF16(" bar"),
-                                        text.length() + 4);
+    edit_view->SetWindowTextAndCaretPos(text + L" bar", text.length() + 4);
     edit_view->OnAfterPossibleChange();
     ASSERT_FALSE(edit_view->model()->is_keyword_hint());
     ASSERT_TRUE(edit_view->model()->keyword().empty());
-    ASSERT_EQ(text + ASCIIToUTF16(" bar"), edit_view->GetText());
+    ASSERT_EQ(text + L" bar", edit_view->GetText());
 
     // Keyword shouldn't be accepted by pressing space with a selected range.
     edit_view->OnBeforePossibleChange();
     edit_view->OnInlineAutocompleteTextMaybeChanged(
-        text + ASCIIToUTF16("  "), text.length());
+        text + L"  ", text.length());
     edit_view->OnAfterPossibleChange();
     ASSERT_TRUE(edit_view->model()->is_keyword_hint());
     ASSERT_EQ(text, edit_view->model()->keyword());
-    ASSERT_EQ(text + ASCIIToUTF16("  "), edit_view->GetText());
+    ASSERT_EQ(text + L"  ", edit_view->GetText());
 
-    string16::size_type start, end;
+    std::wstring::size_type start, end;
     edit_view->GetSelectionBounds(&start, &end);
     ASSERT_NE(start, end);
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_SPACE, false, false, false));
     ASSERT_TRUE(edit_view->model()->is_keyword_hint());
     ASSERT_EQ(text, edit_view->model()->keyword());
-    ASSERT_EQ(text + ASCIIToUTF16(" "), edit_view->GetText());
+    ASSERT_EQ(text + L" ", edit_view->GetText());
 
     edit_view->GetSelectionBounds(&start, &end);
     ASSERT_EQ(start, end);
   }
 
 };
 
 // Test if ctrl-* accelerators are workable in omnibox.
 // See http://crbug.com/19193: omnibox blocks ctrl-* commands
 //
@@ skipping 49 matching lines @@
 // TODO(oshima): enable these tests for views-implmentation when
 // these featuers are supported.
 
 IN_PROC_BROWSER_TEST_F(AutocompleteEditViewTest, UndoRedoLinux) {
   ui_test_utils::NavigateToURL(browser(), GURL(chrome::kAboutBlankURL));
   browser()->FocusLocationBar();
 
   AutocompleteEditView* edit_view = NULL;
   ASSERT_NO_FATAL_FAILURE(GetAutocompleteEditView(&edit_view));
 
-  string16 old_text = edit_view->GetText();
-  EXPECT_EQ(UTF8ToUTF16(chrome::kAboutBlankURL), old_text);
+  std::wstring old_text = edit_view->GetText();
+  EXPECT_EQ(UTF8ToWide(chrome::kAboutBlankURL), old_text);
   EXPECT_TRUE(edit_view->IsSelectAll());
 
   // Undo should clear the omnibox.
   ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_Z, true, false, false));
   EXPECT_TRUE(edit_view->GetText().empty());
 
   // Nothing should happen if undo again.
   ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_Z, true, false, false));
   EXPECT_TRUE(edit_view->GetText().empty());
 
   // Redo should restore the original text.
   ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_Z, true, true, false));
   EXPECT_EQ(old_text, edit_view->GetText());
 
   // Looks like the undo manager doesn't support restoring selection.
   EXPECT_FALSE(edit_view->IsSelectAll());
 
   // The cursor should be at the end.
-  string16::size_type start, end;
+  std::wstring::size_type start, end;
   edit_view->GetSelectionBounds(&start, &end);
   EXPECT_EQ(old_text.size(), start);
   EXPECT_EQ(old_text.size(), end);
 
   // Delete two characters.
   ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_BACK, false, false, false));
   ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_BACK, false, false, false));
   EXPECT_EQ(old_text.substr(0, old_text.size() - 2), edit_view->GetText());
 
   // Undo delete.
@@ skipping 19 matching lines @@
 
   // Undo again.
   ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_Z, true, false, false));
   EXPECT_TRUE(edit_view->GetText().empty());
 }
 
 // See http://crbug.com/63860
 IN_PROC_BROWSER_TEST_F(AutocompleteEditViewTest, PrimarySelection) {
   AutocompleteEditView* edit_view = NULL;
   ASSERT_NO_FATAL_FAILURE(GetAutocompleteEditView(&edit_view));
-  edit_view->SetUserText(ASCIIToUTF16("Hello world"));
+  edit_view->SetUserText(L"Hello world");
   EXPECT_FALSE(edit_view->IsSelectAll());
 
   // Move the cursor to the end.
   ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_END, false, false, false));
 
   // Select all text by pressing Shift+Home
   ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_HOME, false, true, false));
   EXPECT_TRUE(edit_view->IsSelectAll());
 
   // The selected content should be saved to the PRIMARY clipboard.
   EXPECT_EQ("Hello world", GetPrimarySelectionText());
 
   // Move the cursor to the end.
   ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_END, false, false, false));
   EXPECT_FALSE(edit_view->IsSelectAll());
 
   // The content in the PRIMARY clipboard should not be cleared.
   EXPECT_EQ("Hello world", GetPrimarySelectionText());
 }
 
 // See http://crosbug.com/10306
 IN_PROC_BROWSER_TEST_F(AutocompleteEditViewTest,
                        BackspaceDeleteHalfWidthKatakana) {
   AutocompleteEditView* edit_view = NULL;
   ASSERT_NO_FATAL_FAILURE(GetAutocompleteEditView(&edit_view));
   // Insert text: ﾀﾞ
-  edit_view->SetUserText(UTF8ToUTF16("\357\276\200\357\276\236"));
+  edit_view->SetUserText(UTF8ToWide("\357\276\200\357\276\236"));
 
   // Move the cursor to the end.
   ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_END, false, false, false));
 
   // Backspace should delete one character.
   ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_BACK, false, false, false));
-  EXPECT_EQ(UTF8ToUTF16("\357\276\200"), edit_view->GetText());
+  EXPECT_EQ(UTF8ToWide("\357\276\200"), edit_view->GetText());
 }
 
 // http://crbug.com/12316
 IN_PROC_BROWSER_TEST_F(AutocompleteEditViewTest, PasteReplacingAll) {
   AutocompleteEditView* edit_view = NULL;
   ASSERT_NO_FATAL_FAILURE(GetAutocompleteEditView(&edit_view));
   AutocompletePopupModel* popup_model = edit_view->model()->popup_model();
   ASSERT_TRUE(popup_model);
 
   SetClipboardText(kSearchText);
 
   // Paste text.
   ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_V, true, false, false));
   ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone());
   ASSERT_TRUE(popup_model->IsOpen());
 
   // Inline autocomplete shouldn't be triggered.
-  ASSERT_EQ(ASCIIToUTF16("abc"), edit_view->GetText());
+  ASSERT_EQ(L"abc", edit_view->GetText());
 }
 #endif
 
 #if defined(TOOLKIT_VIEWS)
 class AutocompleteEditViewViewsTest : public AutocompleteEditViewTest {
  public:
   AutocompleteEditViewViewsTest() {
     views::NativeTextfieldViews::SetEnableTextfieldViews(true);
   }
 };
@@ skipping 33 matching lines @@
 
 IN_PROC_BROWSER_TEST_F(AutocompleteEditViewViewsTest, BasicTextOperations) {
   BasicTextOperationsTest();
 }
 
 IN_PROC_BROWSER_TEST_F(AutocompleteEditViewViewsTest, AcceptKeywordBySpace) {
   AcceptKeywordBySpaceTest();
 }
 
 #endif