Move UTF16ToASCII, remove WideToASCII.

chrome/common/extensions/api/commands/commands_manifest_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/manifest_tests/extension_manifest_test.h"
 
 #include "base/command_line.h"
 #include "base/strings/string_util.h"
+#include "base/strings/utf_string_conversions.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/api/commands/commands_handler.h"
 #include "chrome/common/extensions/features/feature_channel.h"
 #include "extensions/common/manifest_constants.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace extensions {
 
 namespace errors = manifest_errors;
 
@@ skipping 17 matching lines @@
       LoadAndExpectSuccess("command_simple.json");
   ASSERT_TRUE(extension.get());
 
   const CommandMap* commands = CommandsInfo::GetNamedCommands(extension.get());
   ASSERT_TRUE(commands);
   ASSERT_EQ(1u, commands->size());
   CommandMap::const_iterator iter = commands->begin();
   ASSERT_TRUE(commands->end() != iter);
   const Command* named_command = &(*iter).second;
   ASSERT_STREQ("feature1", named_command->command_name().c_str());
-  ASSERT_STREQ("desc", UTF16ToASCII(named_command->description()).c_str());
+  ASSERT_STREQ("desc",
+               base::UTF16ToASCII(named_command->description()).c_str());
   ASSERT_EQ(ctrl_shift_f, named_command->accelerator());
 
   const Command* browser_action =
       CommandsInfo::GetBrowserActionCommand(extension.get());
   ASSERT_TRUE(NULL != browser_action);
   ASSERT_STREQ("_execute_browser_action",
                browser_action->command_name().c_str());
-  ASSERT_STREQ("", UTF16ToASCII(browser_action->description()).c_str());
+  ASSERT_STREQ("", base::UTF16ToASCII(browser_action->description()).c_str());
   ASSERT_EQ(alt_shift_f, browser_action->accelerator());
 
   const Command* page_action =
       CommandsInfo::GetPageActionCommand(extension.get());
   ASSERT_TRUE(NULL != page_action);
   ASSERT_STREQ("_execute_page_action",
       page_action->command_name().c_str());
-  ASSERT_STREQ("", UTF16ToASCII(page_action->description()).c_str());
+  ASSERT_STREQ("", base::UTF16ToASCII(page_action->description()).c_str());
   ASSERT_EQ(ctrl_f, page_action->accelerator());
 }
 
 TEST_F(CommandsManifestTest, CommandManifestShortcutsTooMany) {
   LoadAndExpectError("command_too_many.json",
                      errors::kInvalidKeyBindingTooMany);
 }
 
 TEST_F(CommandsManifestTest, CommandManifestManyButWithinBounds) {
   scoped_refptr<Extension> extension =
@@ skipping 58 matching lines @@
         LoadAndExpectSuccess("command_app_global.json");
   }
 }
 
 TEST_F(CommandsManifestTest, CommandManifestShouldNotCountMediaKeys) {
   scoped_refptr<Extension> extension =
       LoadAndExpectSuccess("command_should_not_count_media_keys.json");
 }
 
 }  // namespace extensions