Move UTF16ToASCII, remove WideToASCII.

chrome/browser/google/google_util.cc

 // Copyright (c) 2012 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/google/google_util.h"
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 121 matching lines @@
 
 bool GetBrand(std::string* brand) {
   if (brand_for_testing) {
     brand->assign(brand_for_testing);
     return true;
   }
 
   base::string16 brand16;
   bool ret = GoogleUpdateSettings::GetBrand(&brand16);
   if (ret)
-    brand->assign(WideToASCII(brand16));
+    brand->assign(base::UTF16ToASCII(brand16));
   return ret;
 }
 
 bool GetReactivationBrand(std::string* brand) {
   base::string16 brand16;
   bool ret = GoogleUpdateSettings::GetReactivationBrand(&brand16);
   if (ret)
-    brand->assign(WideToASCII(brand16));
+    brand->assign(base::UTF16ToASCII(brand16));
   return ret;
 }
 
 #else
 
 bool GetBrand(std::string* brand) {
   if (brand_for_testing) {
     brand->assign(brand_for_testing);
     return true;
   }
@@ skipping 140 matching lines @@
   DCHECK(brand_for_testing == NULL);
   brand_for_testing = brand_.c_str();
 }
 
 BrandForTesting::~BrandForTesting() {
   brand_for_testing = NULL;
 }
 
 
 }  // namespace google_util