Rework ordering in ExtensionsService::UninstallExtension()

chrome/browser/extensions/extension_prefs.cc

Index: chrome/browser/extensions/extension_prefs.cc
diff --git a/chrome/browser/extensions/extension_prefs.cc b/chrome/browser/extensions/extension_prefs.cc
index 30409031b4b0ba27012d490bb1be0bba1608c836..015d7cbea15867c716ef68727221753eaa7a765c 100644
--- a/chrome/browser/extensions/extension_prefs.cc
+++ b/chrome/browser/extensions/extension_prefs.cc
@@ -385,19 +385,19 @@ void ExtensionPrefs::OnExtensionInstalled(Extension* extension) {
   prefs_->SavePersistentPrefs();
 }
 
-void ExtensionPrefs::OnExtensionUninstalled(const Extension* extension,
+void ExtensionPrefs::OnExtensionUninstalled(const std::string& extension_id,
+                                            const Extension::Location& location,
                                             bool external_uninstall) {
   // For external extensions, we save a preference reminding ourself not to try
   // and install the extension anymore (except when |external_uninstall| is
   // true, which signifies that the registry key was deleted or the pref file
   // no longer lists the extension).
-  if (!external_uninstall &&
-      Extension::IsExternalLocation(extension->location())) {
-    UpdateExtensionPref(extension->id(), kPrefState,
+  if (!external_uninstall && Extension::IsExternalLocation(location)) {
+    UpdateExtensionPref(extension_id, kPrefState,
                         Value::CreateIntegerValue(Extension::KILLBIT));
     prefs_->ScheduleSavePersistentPrefs();
   } else {
-    DeleteExtensionPrefs(extension->id());
+    DeleteExtensionPrefs(extension_id);
   }
 }