Remove the limit of number of commands per extension, but keep the limit of 4 shortcuts per extensi…

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/string_util.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/api/commands/commands_handler.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace errors = extension_manifest_errors;
 
 namespace extensions {
 
 class CommandsManifestTest : public ExtensionManifestTest {
  protected:
   virtual void SetUp() OVERRIDE {
     (new CommandsHandler)->Register();
   }
 };
 
 TEST_F(CommandsManifestTest, CommandManifestSimple) {
-  CommandLine::ForCurrentProcess()->AppendSwitch(
-      switches::kEnableExperimentalExtensionApis);
-
 #if defined(OS_MACOSX)
   int ctrl = ui::EF_COMMAND_DOWN;
 #else
   int ctrl = ui::EF_CONTROL_DOWN;
 #endif
 
   const ui::Accelerator ctrl_f = ui::Accelerator(ui::VKEY_F, ctrl);
   const ui::Accelerator ctrl_shift_f =
       ui::Accelerator(ui::VKEY_F, ctrl | ui::EF_SHIFT_DOWN);
   const ui::Accelerator alt_shift_f =
@@ skipping 22 matching lines @@
   ASSERT_EQ(alt_shift_f, browser_action->accelerator());
 
   const Command* page_action = CommandsInfo::GetPageActionCommand(extension);
   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_EQ(ctrl_f, page_action->accelerator());
 }
 
-TEST_F(CommandsManifestTest, CommandManifestTooMany) {
-  CommandLine::ForCurrentProcess()->AppendSwitch(
-      switches::kEnableExperimentalExtensionApis);
-
+TEST_F(CommandsManifestTest, CommandManifestShortcutsTooMany) {
   LoadAndExpectError("command_too_many.json",
                      errors::kInvalidKeyBindingTooMany);
 }
 
+TEST_F(CommandsManifestTest, CommandManifestManyButWithinBounds) {
+  scoped_refptr<Extension> extension =
+      LoadAndExpectSuccess("command_many_but_shortcuts_under_limit.json");
+}
+
 TEST_F(CommandsManifestTest, CommandManifestAllowNumbers) {
-  CommandLine::ForCurrentProcess()->AppendSwitch(
-      switches::kEnableExperimentalExtensionApis);
-
   scoped_refptr<Extension> extension =
       LoadAndExpectSuccess("command_allow_numbers.json");
 }
 
 TEST_F(CommandsManifestTest, CommandManifestRejectJustShift) {
-  CommandLine::ForCurrentProcess()->AppendSwitch(
-      switches::kEnableExperimentalExtensionApis);
-
   LoadAndExpectError("command_reject_just_shift.json",
       errors::kInvalidKeyBinding);
 }
 
 }  // namespace extensions