Fixes component extension commands assignment on reload.

chrome/browser/extensions/extension_keybinding_apitest.cc

Index: chrome/browser/extensions/extension_keybinding_apitest.cc
diff --git a/chrome/browser/extensions/extension_keybinding_apitest.cc b/chrome/browser/extensions/extension_keybinding_apitest.cc
index e3f2ec38e2308b5f5691dc32401be26496e747ca..1153e138e701df8d0ce6dacfba1ae8f7c3cd0f57 100644
--- a/chrome/browser/extensions/extension_keybinding_apitest.cc
+++ b/chrome/browser/extensions/extension_keybinding_apitest.cc
@@ -7,9 +7,11 @@
 #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"
@@ -956,4 +958,18 @@ IN_PROC_BROWSER_TEST_F(CommandsApiTest, MAYBE_ChromeOSConversions) {
 }
 #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