Fix crash on NTP related to multi-profile extensions.

chrome/browser/ui/webui/ntp/app_launcher_handler.cc

 // Copyright (c) 2011 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/ui/webui/ntp/app_launcher_handler.h"
 
 #include <string>
 #include <vector>
 
 #include "base/auto_reset.h"
@@ skipping 423 matching lines @@
 
   // Tell the client whether to show the promo for this view. We don't do this
   // in the case of PREF_CHANGED because:
   //
   // a) At that point in time, depending on the pref that changed, it can look
   //    like the set of apps installed has changed, and we will mark the promo
   //    expired.
   // b) Conceptually, it doesn't really make sense to count a
   //    prefchange-triggered refresh as a promo 'view'.
   AppsPromo* apps_promo = extension_service_->apps_promo();
-  PrefService* prefs = Profile::FromWebUI(web_ui_)->GetPrefs();
+  Profile* profile = Profile::FromWebUI(web_ui_);
+  PrefService* prefs = profile->GetPrefs();
   bool apps_promo_just_expired = false;
   if (apps_promo->ShouldShowPromo(extension_service_->GetAppIds(),
                                   &apps_promo_just_expired)) {
     apps_promo->MaximizeAppsIfNecessary();
     dictionary.SetBoolean("showPromo", true);
     FillPromoDictionary(&dictionary);
     promo_active_ = true;
   } else {
     dictionary.SetBoolean("showPromo", false);
     promo_active_ = false;
   }
 
   // If the default apps have just expired (user viewed them too many times with
   // no interaction), then we uninstall them and focus the recent sites section.
   if (apps_promo_just_expired) {
     ignore_changes_ = true;
     UninstallDefaultApps();
     ignore_changes_ = false;
     ShownSectionsHandler::SetShownSection(prefs, THUMB);
   }
 
   FillAppDictionary(&dictionary);
   web_ui_->CallJavascriptFunction("getAppsCallback", dictionary);
 
   // First time we get here we set up the observer so that we can tell update
   // the apps as they change.
   if (registrar_.IsEmpty()) {
     registrar_.Add(this, chrome::NOTIFICATION_APP_NOTIFICATION_STATE_CHANGED,

[Yoyo Zhou, 2011/08/29 22:40:46]

This looks like it could possibly be sent from an incognito profile, in which
case we still need to listen to AllSources and filter by IsSameProfile.

[jstritar, 2011/08/30 15:06:31]

Done.

-        NotificationService::AllSources());
+        Source<Profile>(profile));
     registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_LOADED,
-        NotificationService::AllSources());
+        Source<Profile>(profile));
     registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED,
-        NotificationService::AllSources());
+        Source<Profile>(profile));
     registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_LAUNCHER_REORDERED,
-        NotificationService::AllSources());
+        Source<ExtensionPrefs>(extension_service_->extension_prefs()));
     registrar_.Add(this, chrome::NOTIFICATION_WEB_STORE_PROMO_LOADED,
-        NotificationService::AllSources());
+        Source<Profile>(profile));
     registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_INSTALL_ERROR,
-        NotificationService::AllSources());
+        Source<Profile>(profile));
   }
   if (pref_change_registrar_.IsEmpty()) {
     pref_change_registrar_.Init(
         extension_service_->extension_prefs()->pref_service());
     pref_change_registrar_.Add(ExtensionPrefs::kExtensionsPref, this);
     pref_change_registrar_.Add(prefs::kNTPAppPageNames, this);
   }
 }
 
 void AppLauncherHandler::HandleLaunchApp(const ListValue* args) {
@@ skipping 459 matching lines @@
 
 void AppLauncherHandler::UninstallDefaultApps() {
   AppsPromo* apps_promo = extension_service_->apps_promo();
   const ExtensionIdSet& app_ids = apps_promo->old_default_apps();
   for (ExtensionIdSet::const_iterator iter = app_ids.begin();
        iter != app_ids.end(); ++iter) {
     if (extension_service_->GetExtensionById(*iter, true))
       extension_service_->UninstallExtension(*iter, false, NULL);
   }
 }