Fixes component extension commands assignment on reload.

chrome/browser/extensions/extension_keybinding_apitest.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 "base/command_line.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/extensions/active_tab_permission_granter.h"
 #include "chrome/browser/extensions/api/commands/command_service.h"
 #include "chrome/browser/extensions/browser_action_test_util.h"
+#include "chrome/browser/extensions/component_loader.h"
 #include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/extensions/extension_action_manager.h"
 #include "chrome/browser/extensions/extension_apitest.h"
+#include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_command_controller.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/test/base/interactive_test_utils.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/javascript_test_observer.h"
@@ skipping 926 matching lines @@
 #if defined(USE_OZONE)
 #define MAYBE_ChromeOSConversions DISABLED_ChromeOSConversions
 #else
 #define MAYBE_ChromeOSConversions ChromeOSConversions
 #endif
 IN_PROC_BROWSER_TEST_F(CommandsApiTest, MAYBE_ChromeOSConversions) {
   RunChromeOSConversionTest("keybinding/chromeos_conversions");
 }
 #endif  // OS_CHROMEOS
 
+IN_PROC_BROWSER_TEST_F(CommandsApiTest, Component) {

[Finnur, 2015/02/18 11:51:31]

This test would benefit from a comment explaining what we are testing.

[David Tseng, 2015/02/18 18:24:41]

Done.

[Finnur, 2015/02/20 10:31:49]

Actually, I was hoping you'd flesh it out a bit more, something similar to:
Make sure a component extension retains its commands upon removal and re-adding.

[David Tseng, 2015/02/20 18:12:44]

Got it; done.

+  ASSERT_TRUE(test_server()->Start());
+  ASSERT_TRUE(RunComponentExtensionTest("keybinding/component")) << message_;
+
+  ExtensionService* extension_service =
+      extensions::ExtensionSystem::Get(browser()->profile())
+          ->extension_service();
+
+  extension_service->component_loader()->Remove(
+      "pkplfbidichfdicaijlchgnapepdginl");

[Finnur, 2015/02/18 11:51:31]

These six lines of code can probably be shrunk down to two, since you don't use
the extension_service variable beyond line 969.

[David Tseng, 2015/02/18 18:24:41]

Done.

+
+  ASSERT_TRUE(RunComponentExtensionTest("keybinding/component")) << message_;
+}
+
 }  // namespace extensions