Remove wstring from autocomplete....

chrome/browser/instant/instant_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 "base/command_line.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_edit_view.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_window.h"
@@ skipping 61 matching lines @@
     ASSERT_TRUE(location_bar_);
   }
 
   TabContentsWrapper* GetPendingPreviewContents() {
     return browser()->instant()->GetPendingPreviewContents();
   }
 
   // Type a character to get instant to trigger.
   void SetupLocationBar() {
     FindLocationBar();
-    location_bar_->location_entry()->SetUserText(L"a");
+    location_bar_->location_entry()->SetUserText(ASCIIToUTF16("a"));
   }
 
   // Waits for preview to be shown.
   void WaitForPreviewToNavigate(bool use_current) {
     InstantController* instant = browser()->instant();
     ASSERT_TRUE(instant);
     TabContentsWrapper* tab = use_current ?
         instant->GetPreviewContents() : GetPendingPreviewContents();
     ASSERT_TRUE(tab);
     preview_ = tab->tab_contents();
@@ skipping 11 matching lines @@
     ASSERT_TRUE(browser()->instant()->is_active());
 
     // When the page loads, the initial searchBox values are set and only a
     // resize will have been sent.
     ASSERT_EQ("true 0 0 0 1 a false a false 1 1",
               GetSearchStateAsString(preview_));
   }
 
   void SetLocationBarText(const std::wstring& text) {
     ASSERT_NO_FATAL_FAILURE(FindLocationBar());
-    location_bar_->location_entry()->SetUserText(text);
+    location_bar_->location_entry()->SetUserText(WideToUTF16Hack(text));
     ui_test_utils::WaitForNotification(
         NotificationType::INSTANT_CONTROLLER_SHOWN);
   }
 
   const string16& GetSuggestion() const {
     return browser()->instant()->loader_manager_->
         current_loader()->complete_suggested_text_;
   }
 
   void SendKey(ui::KeyboardCode key) {
@@ skipping 281 matching lines @@
   ASSERT_TRUE(browser()->instant()->is_displayable());
   TabContentsWrapper* initial_tab = browser()->instant()->GetPreviewContents();
   ASSERT_TRUE(initial_tab);
   RenderWidgetHostView* rwhv =
       initial_tab->tab_contents()->GetRenderWidgetHostView();
   ASSERT_TRUE(rwhv);
   ASSERT_TRUE(rwhv->IsShowing());
 
   // Now type in some search text.
   ASSERT_NO_FATAL_FAILURE(SetupInstantProvider("search.html"));
-  location_bar_->location_entry()->SetUserText(L"abc");
+  location_bar_->location_entry()->SetUserText(ASCIIToUTF16("abc"));
 
   // Wait for the preview to navigate.
   ASSERT_NO_FATAL_FAILURE(WaitForPreviewToNavigate(false));
 
   // The controller is still determining if the provider really supports
   // instant. As a result the tabcontents should not have changed.
   TabContentsWrapper* current_tab = browser()->instant()->GetPreviewContents();
   ASSERT_EQ(current_tab, initial_tab);
   // The preview should still be showing.
   rwhv = current_tab->tab_contents()->GetRenderWidgetHostView();
@@ skipping 11 matching lines @@
   // Because we're waiting on the page, instant isn't current.
   ASSERT_FALSE(browser()->instant()->IsCurrent());
 
   // Bounce a message to the renderer so that we know the instant has gotten a
   // response back from the renderer as to whether the page supports instant.
   ASSERT_NO_FATAL_FAILURE(
       WaitForMessageToBeProcessedByRenderer(GetPendingPreviewContents()));
 
   // Reset the user text so that the page is told the text changed. We should be
   // able to nuke this once 66104 is fixed.
-  location_bar_->location_entry()->SetUserText(L"abcd");
+  location_bar_->location_entry()->SetUserText(ASCIIToUTF16("abcd"));
 
   // Wait for the renderer to process it.
   ASSERT_NO_FATAL_FAILURE(
       WaitForMessageToBeProcessedByRenderer(GetPendingPreviewContents()));
 
   // We should have gotten a response back from the renderer that resulted in
   // committing.
   ASSERT_FALSE(GetPendingPreviewContents());
   ASSERT_TRUE(browser()->instant()->is_active());
   ASSERT_TRUE(browser()->instant()->is_displayable());
   TabContentsWrapper* new_tab = browser()->instant()->GetPreviewContents();
   ASSERT_TRUE(new_tab);
   ASSERT_NE(new_tab, initial_tab);
   RenderWidgetHostView* new_rwhv =
       new_tab->tab_contents()->GetRenderWidgetHostView();
   ASSERT_TRUE(new_rwhv);
   ASSERT_NE(new_rwhv, rwhv);
   ASSERT_TRUE(new_rwhv->IsShowing());
 }
 
 // Makes sure that if the server doesn't support the instant API we don't show
 // anything.
 IN_PROC_BROWSER_TEST_F(InstantTest, SearchServerDoesntSupportInstant) {
   ASSERT_TRUE(test_server()->Start());
   ASSERT_NO_FATAL_FAILURE(SetupInstantProvider("empty.html"));
   ASSERT_NO_FATAL_FAILURE(FindLocationBar());
-  location_bar_->location_entry()->SetUserText(L"a");
+  location_bar_->location_entry()->SetUserText(ASCIIToUTF16("a"));
   ASSERT_TRUE(browser()->instant());
   // Because we typed in a search string we should think we're showing instant
   // results.
   EXPECT_TRUE(browser()->instant()->IsShowingInstant());
   // But because we're waiting to determine if the page really supports instant
   // we shouldn't be showing the preview.
   EXPECT_FALSE(browser()->instant()->is_displayable());
   // But instant should still be active.
   EXPECT_TRUE(browser()->instant()->is_active());
 
@@ skipping 18 matching lines @@
   ASSERT_TRUE(browser()->instant()->is_displayable());
   ASSERT_TRUE(browser()->instant()->is_active());
   TabContentsWrapper* initial_tab = browser()->instant()->GetPreviewContents();
   ASSERT_TRUE(initial_tab);
   RenderWidgetHostView* rwhv =
       initial_tab->tab_contents()->GetRenderWidgetHostView();
   ASSERT_TRUE(rwhv);
   ASSERT_TRUE(rwhv->IsShowing());
 
   // Now type in some search text.
-  location_bar_->location_entry()->SetUserText(L"a");
+  location_bar_->location_entry()->SetUserText(ASCIIToUTF16("a"));
 
   // Instant should still be live.
   ASSERT_TRUE(browser()->instant()->is_displayable());
   ASSERT_TRUE(browser()->instant()->is_active());
   // Because we typed in a search string we should think we're showing instant
   // results.
   EXPECT_TRUE(browser()->instant()->MightSupportInstant());
   // Instant should not be current (it's still loading).
   EXPECT_FALSE(browser()->instant()->IsCurrent());
 
@@ skipping 29 matching lines @@
       &height));
   EXPECT_GT(height, 0);
 }
 
 // Verifies that if the server returns a 403 we don't show the preview and
 // query the host again.
 IN_PROC_BROWSER_TEST_F(InstantTest, HideOn403) {
   ASSERT_TRUE(test_server()->Start());
   GURL url(test_server()->GetURL("files/instant/403.html"));
   ASSERT_NO_FATAL_FAILURE(FindLocationBar());
-  location_bar_->location_entry()->SetUserText(UTF8ToWide(url.spec()));
+  location_bar_->location_entry()->SetUserText(UTF8ToUTF16(url.spec()));
   // The preview shouldn't be showing, but it should be loading.
   ASSERT_TRUE(browser()->instant()->GetPreviewContents());
   ASSERT_TRUE(browser()->instant()->is_active());
   ASSERT_FALSE(browser()->instant()->is_displayable());
 
   // When instant sees the 403, it should close the tab.
   ui_test_utils::WaitForNotification(NotificationType::TAB_CLOSED);
   ASSERT_FALSE(browser()->instant()->GetPreviewContents());
   ASSERT_TRUE(browser()->instant()->is_active());
   ASSERT_FALSE(browser()->instant()->is_displayable());
 
   // Try loading another url on the server. Instant shouldn't create a new tab
   // as the server returned 403.
   GURL url2(test_server()->GetURL("files/instant/empty.html"));
-  location_bar_->location_entry()->SetUserText(UTF8ToWide(url2.spec()));
+  location_bar_->location_entry()->SetUserText(UTF8ToUTF16(url2.spec()));
   ASSERT_FALSE(browser()->instant()->GetPreviewContents());
   ASSERT_TRUE(browser()->instant()->is_active());
   ASSERT_FALSE(browser()->instant()->is_displayable());
 }
 
 // Verify that the onsubmit event is dispatched upon pressing enter.
 IN_PROC_BROWSER_TEST_F(InstantTest, OnSubmitEvent) {
   ASSERT_TRUE(test_server()->Start());
   ASSERT_NO_FATAL_FAILURE(SetupInstantProvider("search.html"));
 
@@ skipping 51 matching lines @@
 
   ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
   ASSERT_NO_FATAL_FAILURE(SetupLocationBar());
   ASSERT_NO_FATAL_FAILURE(SetupPreview());
 
   ASSERT_NO_FATAL_FAILURE(SetLocationBarText(L"abc"));
 
   // Pressing tab to convert instant suggest into inline autocomplete.
   ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB));
 
-  ASSERT_EQ(L"abcdef", location_bar_->location_entry()->GetText());
+  ASSERT_EQ(ASCIIToUTF16("abcdef"), location_bar_->location_entry()->GetText());
 
   EXPECT_EQ("true 0 0 2 2 a false abcdef false 6 6",
       GetSearchStateAsString(preview_));
 
   // Pressing tab again to accept the current instant preview.
   ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB));
 
   // Check that the preview contents have been committed.
   ASSERT_FALSE(browser()->instant()->GetPreviewContents());
   ASSERT_FALSE(browser()->instant()->is_active());
   TabContents* contents = browser()->GetSelectedTabContents();
   ASSERT_TRUE(contents);
 
   // Check that the value is reflected and onsubmit is called.
   EXPECT_EQ("true 1 0 2 2 a false abcdef true 6 6",
       GetSearchStateAsString(preview_));
 }