Move UTF16ToASCII, remove WideToASCII.

chrome/browser/ui/search/instant_search_prerenderer_unittest.cc

 // Copyright 2013 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 "chrome/browser/ui/search/instant_search_prerenderer.h"
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/field_trial.h"
@@ skipping 219 matching lines @@
     EXPECT_NE(static_cast<PrerenderHandle*>(NULL), prerender_handle());
   }
 };
 
 TEST_F(InstantSearchPrerendererTest, GetSearchTermsFromPrerenderedPage) {
   Init(false, false);
   InstantSearchPrerenderer* prerenderer = GetInstantSearchPrerenderer();
   GURL url(GetPrerenderURL());
   EXPECT_EQ(GURL("https://www.google.com/instant?ion=1&foo=foo#foo=foo&strk"),
             url);
-  EXPECT_EQ(UTF16ToASCII(prerenderer->get_last_query()),
-            UTF16ToASCII(chrome::ExtractSearchTermsFromURL(profile(), url)));
+  EXPECT_EQ(base::UTF16ToASCII(prerenderer->get_last_query()),
+            base::UTF16ToASCII(
+                chrome::ExtractSearchTermsFromURL(profile(), url)));
 
   // Assume the prerendered page prefetched search results for the query
   // "flowers".
   SetLastQuery(ASCIIToUTF16("flowers"));
-  EXPECT_EQ("flowers", UTF16ToASCII(prerenderer->get_last_query()));
-  EXPECT_EQ(UTF16ToASCII(prerenderer->get_last_query()),
-            UTF16ToASCII(chrome::ExtractSearchTermsFromURL(profile(), url)));
+  EXPECT_EQ("flowers", base::UTF16ToASCII(prerenderer->get_last_query()));
+  EXPECT_EQ(base::UTF16ToASCII(prerenderer->get_last_query()),
+            base::UTF16ToASCII(
+                chrome::ExtractSearchTermsFromURL(profile(), url)));
 }
 
 TEST_F(InstantSearchPrerendererTest, PrefetchSearchResults) {
   Init(true, true);
   EXPECT_TRUE(prerender_handle()->IsFinishedLoading());
   InstantSearchPrerenderer* prerenderer = GetInstantSearchPrerenderer();
   prerenderer->Prerender(
       InstantSuggestion(ASCIIToUTF16("flowers"), std::string()));
-  EXPECT_EQ("flowers", UTF16ToASCII(prerenderer->get_last_query()));
+  EXPECT_EQ("flowers", base::UTF16ToASCII(prerenderer->get_last_query()));
   EXPECT_TRUE(MessageWasSent(
       ChromeViewMsg_SearchBoxSetSuggestionToPrefetch::ID));
 }
 
 TEST_F(InstantSearchPrerendererTest, DoNotPrefetchSearchResults) {
   Init(true, false);
   // Page hasn't finished loading yet.
   EXPECT_FALSE(prerender_handle()->IsFinishedLoading());
   InstantSearchPrerenderer* prerenderer = GetInstantSearchPrerenderer();
   prerenderer->Prerender(
       InstantSuggestion(ASCIIToUTF16("flowers"), std::string()));
-  EXPECT_EQ("", UTF16ToASCII(prerenderer->get_last_query()));
+  EXPECT_EQ("", base::UTF16ToASCII(prerenderer->get_last_query()));
   EXPECT_FALSE(MessageWasSent(
       ChromeViewMsg_SearchBoxSetSuggestionToPrefetch::ID));
 }
 
 TEST_F(InstantSearchPrerendererTest, CanCommitQuery) {
   Init(true, true);
   InstantSearchPrerenderer* prerenderer = GetInstantSearchPrerenderer();
   base::string16 query = ASCIIToUTF16("flowers");
   prerenderer->Prerender(InstantSuggestion(query, std::string()));
   EXPECT_TRUE(prerenderer->CanCommitQuery(GetActiveWebContents(), query));
@@ skipping 189 matching lines @@
   // key. Make sure UsePrerenderedPage() extracts the search terms from the URL
   // and uses the prerendered page contents.
   GURL url("https://www.google.com/alt#quux=foo");
   browser()->OpenURL(content::OpenURLParams(url, Referrer(), CURRENT_TAB,
                                             content::PAGE_TRANSITION_TYPED,
                                             false));
   EXPECT_EQ(GetPrerenderURL(), GetActiveWebContents()->GetURL());
   EXPECT_EQ(static_cast<PrerenderHandle*>(NULL), prerender_handle());
 }
 #endif