Rename ExtensionCommand* to Command* within the extension namespace.

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/extension_commands.h"
+#include "chrome/common/extensions/command.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-class ExtensionCommandsTest : public testing::Test {
+class CommandTest : public testing::Test {
 };
 
-TEST(ExtensionCommandsTest, ExtensionCommandParsing) {
+TEST(CommandTest, ExtensionCommandParsing) {
   const ui::Accelerator none = ui::Accelerator();
   const ui::Accelerator shift_f = ui::Accelerator(ui::VKEY_F,
                                                   ui::EF_SHIFT_DOWN);
   const ui::Accelerator ctrl_f = ui::Accelerator(ui::VKEY_F,
                                                 ui::EF_CONTROL_DOWN);
   const ui::Accelerator alt_f = ui::Accelerator(ui::VKEY_F, ui::EF_ALT_DOWN);
   const ui::Accelerator ctrl_shift_f =
       ui::Accelerator(ui::VKEY_F, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN);
   const ui::Accelerator alt_shift_f =
       ui::Accelerator(ui::VKEY_F, ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN);
@@ skipping 81 matching lines @@
     EXPECT_EQ(kTests[i].expected_result, result);
     if (result) {
       EXPECT_STREQ(kTests[i].description,
                    UTF16ToASCII(command.description()).c_str());
       EXPECT_STREQ(kTests[i].command_name, command.command_name().c_str());
       EXPECT_EQ(kTests[i].accelerator, command.accelerator());
     }
   }
 }
 
-TEST(ExtensionCommandsTest, ExtensionCommandParsingFallback) {
+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<DictionaryValue> input(new DictionaryValue);
   DictionaryValue* key_dict = new DictionaryValue();
   key_dict->SetString("default",  "Ctrl+Shift+D");
   key_dict->SetString("windows",  "Ctrl+Shift+W");
   key_dict->SetString("mac",      "Ctrl+Shift+M");
@@ skipping 56 matching lines @@
   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));
   key_dict->SetString("windows", "Options+Shift+M");
   EXPECT_FALSE(command.Parse(input.get(), command_name, 0, &error));
 #endif
 }