Move UTF16ToASCII, remove WideToASCII.

chrome/common/extensions/command_unittest.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/common/extensions/command.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 119 matching lines @@
                  "| index: " + base::IntToString(i));
 
     extensions::Command command;
     base::string16 error;
     bool result =
         command.Parse(input.get(), kTests[i].command_name, i, &error);
 
     EXPECT_EQ(kTests[i].expected_result, result);
     if (result) {
       EXPECT_STREQ(kTests[i].description,
-                   UTF16ToASCII(command.description()).c_str());
+                   base::UTF16ToASCII(command.description()).c_str());
       EXPECT_STREQ(kTests[i].command_name, command.command_name().c_str());
       EXPECT_EQ(kTests[i].accelerator, command.accelerator());
     }
 
     // Now parse the command as a dictionary of multiple values.
     if (kTests[i].key[0] != '\0') {
       input.reset(new base::DictionaryValue);
       base::DictionaryValue* key_dict = new base::DictionaryValue();
       key_dict->SetString("default", kTests[i].key);
       key_dict->SetString("windows", kTests[i].key);
       key_dict->SetString("mac", kTests[i].key);
       input->Set("suggested_key", key_dict);
       input->SetString("description", kTests[i].description);
 
       result = command.Parse(input.get(), kTests[i].command_name, i, &error);
 
       EXPECT_EQ(kTests[i].expected_result, result);
       if (result) {
         EXPECT_STREQ(kTests[i].description,
-                     UTF16ToASCII(command.description()).c_str());
+                     base::UTF16ToASCII(command.description()).c_str());
         EXPECT_STREQ(kTests[i].command_name, command.command_name().c_str());
         EXPECT_EQ(kTests[i].accelerator, command.accelerator());
       }
     }
   }
 }
 
 TEST(CommandTest, ExtensionCommandParsingFallback) {
   std::string description = "desc";
   std::string command_name = "foo";
 
   // Test that platform specific keys are honored on each platform, despite
   // fallback being given.
   scoped_ptr<base::DictionaryValue> input(new base::DictionaryValue);
   base::DictionaryValue* key_dict = new base::DictionaryValue();
   key_dict->SetString("default",  "Ctrl+Shift+D");
   key_dict->SetString("windows",  "Ctrl+Shift+W");
   key_dict->SetString("mac",      "Ctrl+Shift+M");
   key_dict->SetString("linux",    "Ctrl+Shift+L");
   key_dict->SetString("chromeos", "Ctrl+Shift+C");
   input->Set("suggested_key", key_dict);
   input->SetString("description", description);
 
   extensions::Command command;
   base::string16 error;
   EXPECT_TRUE(command.Parse(input.get(), command_name, 0, &error));
   EXPECT_STREQ(description.c_str(),
-               UTF16ToASCII(command.description()).c_str());
+               base::UTF16ToASCII(command.description()).c_str());
   EXPECT_STREQ(command_name.c_str(), command.command_name().c_str());
 
 #if defined(OS_WIN)
   ui::Accelerator accelerator(ui::VKEY_W,
                               ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN);
 #elif defined(OS_MACOSX)
   ui::Accelerator accelerator(ui::VKEY_M,
                               ui::EF_SHIFT_DOWN | ui::EF_COMMAND_DOWN);
 #elif defined(OS_CHROMEOS)
   ui::Accelerator accelerator(ui::VKEY_C,
@@ skipping 42 matching lines @@
   key_dict->SetString("windows", "Ctrl+Shift+W");
 #endif
   EXPECT_FALSE(command.Parse(input.get(), command_name, 0, &error));
 
   // Make sure Mac specific keys are not processed on other platforms.
 #if !defined(OS_MACOSX)
   key_dict->SetString("windows", "Command+Shift+M");
   EXPECT_FALSE(command.Parse(input.get(), command_name, 0, &error));
 #endif
 }