Move UTF16ToASCII, remove WideToASCII.

chrome/browser/translate/translate_browsertest.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 "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/infobars/infobar.h"
@@ skipping 172 matching lines @@
   net::URLRequestStatus status;
   status.set_status(net::URLRequestStatus::SUCCESS);
   fetcher->set_status(status);
   fetcher->set_url(fetcher->GetOriginalURL());
   fetcher->set_response_code(net::HTTP_OK);
   fetcher->SetResponseString(element_js);
   fetcher->delegate()->OnURLFetchComplete(fetcher);
 
   // Wait for the page title is changed after the test finished.
   const base::string16 result = watcher.WaitAndGetTitle();
-  EXPECT_EQ("PASS", UTF16ToASCII(result));
+  EXPECT_EQ("PASS", base::UTF16ToASCII(result));
 }
 
 IN_PROC_BROWSER_TEST_F(TranslateBrowserTest, IgnoreRefreshMetaTag) {
 #if defined(OS_WIN) && defined(USE_ASH)
   // Disable this test in Metro+Ash for now (http://crbug.com/262796).
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
     return;
 #endif
 
   ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
 
   // Check if there is no Translate infobar.
   TranslateInfoBarDelegate* translate = GetExistingTranslateInfoBarDelegate();
   EXPECT_FALSE(translate);
 
   // Setup page title observer.
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
   ASSERT_TRUE(web_contents);
   content::TitleWatcher watcher(web_contents, base::ASCIIToUTF16("PASS"));
   watcher.AlsoWaitForTitle(base::ASCIIToUTF16("FAIL"));
 
   // Visit a test page.
   ui_test_utils::NavigateToURL(
       browser(),
       GetNonSecureURL(kRefreshMetaTagTestPath));
 
   // Wait for the page title is changed after the test finished.
   const base::string16 result = watcher.WaitAndGetTitle();
-  EXPECT_EQ("PASS", UTF16ToASCII(result));
+  EXPECT_EQ("PASS", base::UTF16ToASCII(result));
 
   // Check if there is no Translate infobar.
   translate = GetExistingTranslateInfoBarDelegate();
   EXPECT_FALSE(translate);
 }
 
 IN_PROC_BROWSER_TEST_F(TranslateBrowserTest,
                        IgnoreRefreshMetaTagInCaseInsensitive) {
 #if defined(OS_WIN) && defined(USE_ASH)
   // Disable this test in Metro+Ash for now (http://crbug.com/262796).
@@ skipping 14 matching lines @@
   content::TitleWatcher watcher(web_contents, base::ASCIIToUTF16("PASS"));
   watcher.AlsoWaitForTitle(base::ASCIIToUTF16("FAIL"));
 
   // Visit a test page.
   ui_test_utils::NavigateToURL(
       browser(),
       GetNonSecureURL(kRefreshMetaTagCaseInsensitiveTestPath));
 
   // Wait for the page title is changed after the test finished.
   const base::string16 result = watcher.WaitAndGetTitle();
-  EXPECT_EQ("PASS", UTF16ToASCII(result));
+  EXPECT_EQ("PASS", base::UTF16ToASCII(result));
 
   // Check if there is no Translate infobar.
   translate = GetExistingTranslateInfoBarDelegate();
   EXPECT_FALSE(translate);
 }
 
 IN_PROC_BROWSER_TEST_F(TranslateBrowserTest, IgnoreRefreshMetaTagAtOnload) {
 #if defined(OS_WIN) && defined(USE_ASH)
   // Disable this test in Metro+Ash for now (http://crbug.com/262796).
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
@@ skipping 13 matching lines @@
   content::TitleWatcher watcher(web_contents, base::ASCIIToUTF16("PASS"));
   watcher.AlsoWaitForTitle(base::ASCIIToUTF16("FAIL"));
 
   // Visit a test page.
   ui_test_utils::NavigateToURL(
       browser(),
       GetNonSecureURL(kRefreshMetaTagAtOnloadTestPath));
 
   // Wait for the page title is changed after the test finished.
   const base::string16 result = watcher.WaitAndGetTitle();
-  EXPECT_EQ("PASS", UTF16ToASCII(result));
+  EXPECT_EQ("PASS", base::UTF16ToASCII(result));
 
   // Check if there is no Translate infobar.
   translate = GetExistingTranslateInfoBarDelegate();
   EXPECT_FALSE(translate);
 }
 
 IN_PROC_BROWSER_TEST_F(TranslateBrowserTest, UpdateLocation) {
 #if defined(OS_WIN) && defined(USE_ASH)
   // Disable this test in Metro+Ash for now (http://crbug.com/262796).
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
@@ skipping 13 matching lines @@
   content::TitleWatcher watcher(web_contents, base::ASCIIToUTF16("PASS"));
   watcher.AlsoWaitForTitle(base::ASCIIToUTF16("FAIL"));
 
   // Visit a test page.
   ui_test_utils::NavigateToURL(
       browser(),
       GetNonSecureURL(kUpdateLocationTestPath));
 
   // Wait for the page title is changed after the test finished.
   const base::string16 result = watcher.WaitAndGetTitle();
-  EXPECT_EQ("PASS", UTF16ToASCII(result));
+  EXPECT_EQ("PASS", base::UTF16ToASCII(result));
 
   // Check if there is no Translate infobar.
   translate = GetExistingTranslateInfoBarDelegate();
   EXPECT_FALSE(translate);
 }
 
 IN_PROC_BROWSER_TEST_F(TranslateBrowserTest, UpdateLocationAtOnload) {
 #if defined(OS_WIN) && defined(USE_ASH)
   // Disable this test in Metro+Ash for now (http://crbug.com/262796).
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
@@ skipping 13 matching lines @@
   content::TitleWatcher watcher(web_contents, base::ASCIIToUTF16("PASS"));
   watcher.AlsoWaitForTitle(base::ASCIIToUTF16("FAIL"));
 
   // Visit a test page.
   ui_test_utils::NavigateToURL(
       browser(),
       GetNonSecureURL(kUpdateLocationAtOnloadTestPath));
 
   // Wait for the page title is changed after the test finished.
   const base::string16 result = watcher.WaitAndGetTitle();
-  EXPECT_EQ("PASS", UTF16ToASCII(result));
+  EXPECT_EQ("PASS", base::UTF16ToASCII(result));
 
   // Check if there is no Translate infobar.
   translate = GetExistingTranslateInfoBarDelegate();
   EXPECT_FALSE(translate);
 }