Move UTF16ToASCII, remove WideToASCII.

chrome/browser/sync/test/integration/sync_test.cc

Index: chrome/browser/sync/test/integration/sync_test.cc
diff --git a/chrome/browser/sync/test/integration/sync_test.cc b/chrome/browser/sync/test/integration/sync_test.cc
index c540f7f9a6d88989a0660a7dccad5747efcdbe4b..8e381ae5f4bbe2d208861edc5f8cbc2940dd0b21 100644
--- a/chrome/browser/sync/test/integration/sync_test.cc
+++ b/chrome/browser/sync/test/integration/sync_test.cc
@@ -685,8 +685,9 @@ void SyncTest::DisableNotificationsImpl() {
   std::string path = "chromiumsync/disablenotifications";
   ui_test_utils::NavigateToURL(browser(), sync_server_.GetURL(path));
   ASSERT_EQ("Notifications disabled",
-            UTF16ToASCII(browser()->tab_strip_model()->GetActiveWebContents()->
-                GetTitle()));
+            base::UTF16ToASCII(
+                browser()->tab_strip_model()->GetActiveWebContents()->
+                    GetTitle()));
 }
 
 void SyncTest::DisableNotifications() {
@@ -699,8 +700,9 @@ void SyncTest::EnableNotificationsImpl() {
   std::string path = "chromiumsync/enablenotifications";
   ui_test_utils::NavigateToURL(browser(), sync_server_.GetURL(path));
   ASSERT_EQ("Notifications enabled",
-            UTF16ToASCII(browser()->tab_strip_model()->GetActiveWebContents()->
-                GetTitle()));
+            base::UTF16ToASCII(
+                browser()->tab_strip_model()->GetActiveWebContents()->
+                    GetTitle()));
 }
 
 void SyncTest::EnableNotifications() {
@@ -721,8 +723,9 @@ void SyncTest::TriggerNotification(syncer::ModelTypeSet changed_types) {
       syncer::kSyncP2PNotificationChannel + "&data=" + data;
   ui_test_utils::NavigateToURL(browser(), sync_server_.GetURL(path));
   ASSERT_EQ("Notification sent",
-            UTF16ToASCII(browser()->tab_strip_model()->GetActiveWebContents()->
-                GetTitle()));
+            base::UTF16ToASCII(
+                browser()->tab_strip_model()->GetActiveWebContents()->
+                    GetTitle()));
 }
 
 bool SyncTest::ServerSupportsErrorTriggering() const {
@@ -746,8 +749,9 @@ void SyncTest::TriggerMigrationDoneError(syncer::ModelTypeSet model_types) {
   }
   ui_test_utils::NavigateToURL(browser(), sync_server_.GetURL(path));
   ASSERT_EQ("Migration: 200",
-            UTF16ToASCII(browser()->tab_strip_model()->GetActiveWebContents()->
-                GetTitle()));
+            base::UTF16ToASCII(
+                browser()->tab_strip_model()->GetActiveWebContents()->
+                    GetTitle()));
 }
 
 void SyncTest::TriggerBirthdayError() {
@@ -755,8 +759,9 @@ void SyncTest::TriggerBirthdayError() {
   std::string path = "chromiumsync/birthdayerror";
   ui_test_utils::NavigateToURL(browser(), sync_server_.GetURL(path));
   ASSERT_EQ("Birthday error",
-            UTF16ToASCII(browser()->tab_strip_model()->GetActiveWebContents()->
-                GetTitle()));
+            base::UTF16ToASCII(
+                browser()->tab_strip_model()->GetActiveWebContents()->
+                    GetTitle()));
 }
 
 void SyncTest::TriggerTransientError() {
@@ -764,8 +769,9 @@ void SyncTest::TriggerTransientError() {
   std::string path = "chromiumsync/transienterror";
   ui_test_utils::NavigateToURL(browser(), sync_server_.GetURL(path));
   ASSERT_EQ("Transient error",
-            UTF16ToASCII(browser()->tab_strip_model()->GetActiveWebContents()->
-                GetTitle()));
+            base::UTF16ToASCII(
+                browser()->tab_strip_model()->GetActiveWebContents()->
+                    GetTitle()));
 }
 
 void SyncTest::TriggerAuthState(PythonServerAuthState auth_state) {
@@ -850,7 +856,7 @@ void SyncTest::TriggerSyncError(const syncer::SyncProtocolError& error,
   path.append(base::StringPrintf("&frequency=%d", frequency));
 
   ui_test_utils::NavigateToURL(browser(), sync_server_.GetURL(path));
-  std::string output = UTF16ToASCII(
+  std::string output = base::UTF16ToASCII(
       browser()->tab_strip_model()->GetActiveWebContents()->GetTitle());
   ASSERT_TRUE(output.find("SetError: 200") != base::string16::npos);
 }
@@ -860,8 +866,9 @@ void SyncTest::TriggerCreateSyncedBookmarks() {
   std::string path = "chromiumsync/createsyncedbookmarks";
   ui_test_utils::NavigateToURL(browser(), sync_server_.GetURL(path));
   ASSERT_EQ("Synced Bookmarks",
-            UTF16ToASCII(browser()->tab_strip_model()->GetActiveWebContents()->
-                GetTitle()));
+            base::UTF16ToASCII(
+                browser()->tab_strip_model()->GetActiveWebContents()->
+                    GetTitle()));
 }
 
 void SyncTest::SetProxyConfig(net::URLRequestContextGetter* context_getter,