Change extension unload notification to indicate updates....

chrome/browser/sync/glue/extension_change_processor.cc

 // Copyright (c) 2010 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/sync/glue/extension_change_processor.h"
 
 #include <sstream>
 #include <string>
 
 #include "base/logging.h"
@@ skipping 31 matching lines @@
 void ExtensionChangeProcessor::Observe(NotificationType type,
                                        const NotificationSource& source,
                                        const NotificationDetails& details) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(running());
   DCHECK(profile_);
   if ((type != NotificationType::EXTENSION_INSTALLED) &&
       (type != NotificationType::EXTENSION_UNINSTALLED) &&
       (type != NotificationType::EXTENSION_LOADED) &&
       (type != NotificationType::EXTENSION_UPDATE_DISABLED) &&
-      (type != NotificationType::EXTENSION_UNLOADED) &&
-      (type != NotificationType::EXTENSION_UNLOADED_DISABLED)) {
+      (type != NotificationType::EXTENSION_UNLOADED)) {
     LOG(DFATAL) << "Received unexpected notification of type "
                 << type.value;
     return;
   }
 
   DCHECK_EQ(Source<Profile>(source).ptr(), profile_);
   if (type == NotificationType::EXTENSION_UNINSTALLED) {
     const UninstalledExtensionInfo* uninstalled_extension_info =
         Details<UninstalledExtensionInfo>(details).ptr();
     CHECK(uninstalled_extension_info);
     if (traits_.should_handle_extension_uninstall(
             *uninstalled_extension_info)) {
       const std::string& id = uninstalled_extension_info->extension_id;
       VLOG(1) << "Removing server data for uninstalled extension " << id
               << " of type " << uninstalled_extension_info->extension_type;
       RemoveServerData(traits_, id, profile_->GetProfileSyncService());
     }
   } else {
-    const Extension* extension = Details<const Extension>(details).ptr();
+    const Extension* extension = NULL;
+    if (type == NotificationType::EXTENSION_UNLOADED) {
+      extension = Details<UnloadedExtensionInfo>(details)->extension;
+    } else {
+      extension = Details<const Extension>(details).ptr();
+    }
     CHECK(extension);
     VLOG(1) << "Updating server data for extension " << extension->id()
             << " (notification type = " << type.value << ")";
     if (!traits_.is_valid_and_syncable(*extension)) {
       return;
     }
     std::string error;
     if (!UpdateServerData(traits_, *extension,
                           profile_->GetProfileSyncService(), &error)) {
       error_handler()->OnUnrecoverableError(FROM_HERE, error);
@@ skipping 87 matching lines @@
       Source<Profile>(profile_));
   // Despite the name, this notification is exactly like
   // EXTENSION_LOADED but with an initial state of DISABLED.
   notification_registrar_.Add(
       this, NotificationType::EXTENSION_UPDATE_DISABLED,
       Source<Profile>(profile_));
 
   notification_registrar_.Add(
       this, NotificationType::EXTENSION_UNLOADED,
       Source<Profile>(profile_));
-  notification_registrar_.Add(
-      this, NotificationType::EXTENSION_UNLOADED_DISABLED,
-      Source<Profile>(profile_));
 }
 
 void ExtensionChangeProcessor::StopObserving() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(profile_);
   VLOG(1) << "Unobserving all notifications";
   notification_registrar_.RemoveAll();
 }
 
 }  // namespace browser_sync