Fixes component extension commands assignment on reload.

chrome/browser/extensions/api/commands/command_service.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/browser/extensions/api/commands/command_service.h"
 
 #include <vector>
 
 #include "base/lazy_instance.h"
 #include "base/prefs/scoped_user_pref_update.h"
@@ skipping 787 matching lines @@
 
     const base::DictionaryValue* item = NULL;
     it.value().GetAsDictionary(&item);
 
     std::string extension;
     item->GetString(kExtension, &extension);
 
     if (extension == extension_id) {
       // If |command_name| is specified, delete only that command. Otherwise,
       // delete all commands.
-      if (!command_name.empty()) {
         std::string command;

[Mike Wittman, 2015/02/13 22:11:20]

indentation (+ next three lines)

         item->GetString(kCommandName, &command);
-        if (command_name != command)
+        if (!command_name.empty() && command_name != command)
           continue;
-      }
 
       keys_to_remove.push_back(it.key());
+
+      // Only clear the was_assigned pref if we clear all commands.
+      if (!command_name.empty())
+        continue;
+
+      scoped_ptr<base::DictionaryValue> command_keys(new base::DictionaryValue);
+      command_keys->SetBoolean(kSuggestedKeyWasAssigned, false);

[Mike Wittman, 2015/02/13 22:11:20]

I'd prefer to remove this key from the preferences entirely since it is
meaningless when the extension is not installed.

+      scoped_ptr<base::DictionaryValue> suggested_key_prefs(
+          new base::DictionaryValue);
+      suggested_key_prefs->Set(command, command_keys.release());
+      MergeSuggestedKeyPrefs(extension_id, ExtensionPrefs::Get(profile_),
+                             suggested_key_prefs.Pass());
     }
   }
 
   for (KeysToRemove::const_iterator it = keys_to_remove.begin();
        it != keys_to_remove.end(); ++it) {
     std::string key = *it;
     bindings->Remove(key, NULL);
 
     ExtensionCommandRemovedDetails details(extension_id, command_name,
                                            StripCurrentPlatform(key));
@@ skipping 59 matching lines @@
   return true;
 }
 
 template <>
 void
 BrowserContextKeyedAPIFactory<CommandService>::DeclareFactoryDependencies() {
   DependsOn(ExtensionCommandsGlobalRegistry::GetFactoryInstance());
 }
 
 }  // namespace extensions