Passing ProfileID instead of Profile* to clarify that profile should not be used for making any cal…

chrome/browser/notifications/message_center_notification_manager.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/notifications/message_center_notification_manager.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
@@ skipping 99 matching lines @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NotificationUIManager
 
 void MessageCenterNotificationManager::Add(const Notification& notification,
                                            Profile* profile) {
   if (Update(notification, profile))
     return;
 
-  ProfileNotification* profile_notification =
-      new ProfileNotification(profile, notification);
+  ProfileNotification* profile_notification = new ProfileNotification(
+      NotificationUIManager::GetProfileID(profile), notification);
 
   ExtensionWelcomeNotificationFactory::GetForBrowserContext(profile)->
       ShowWelcomeNotificationIfNecessary(profile_notification->notification());
 
   // WARNING: You MUST use AddProfileNotification or update the message center
   // via the notification within a ProfileNotification object or the profile ID
   // will not be correctly set for ChromeOS.
   // Takes ownership of profile_notification.
   AddProfileNotification(profile_notification);
 
   // TODO(liyanhou): Change the logic to only send notifications to one party.
   // Currently, if there is an app with notificationProvider permission,
   // notifications will go to both message center and the app.
   // Change it to send notifications to message center only when the user chose
   // default message center (extension_id.empty()).
 
   // If there exist apps/extensions that have notificationProvider permission,
   // route notifications to one of the apps/extensions.
   std::string extension_id = GetExtensionTakingOverNotifications(profile);
   if (!extension_id.empty())
-    AddNotificationToAlternateProvider(profile_notification, extension_id);
+    AddNotificationToAlternateProvider(profile_notification->notification(),
+                                       profile, extension_id);
 
   message_center_->AddNotification(make_scoped_ptr(
       new message_center::Notification(profile_notification->notification())));
 }
 
 bool MessageCenterNotificationManager::Update(const Notification& notification,
                                               Profile* profile) {
   const std::string& tag = notification.tag();
   if (tag.empty())
     return false;
 
   const GURL origin_url = notification.origin_url();
   DCHECK(origin_url.is_valid());
 
   // Since tag is provided by arbitrary JS, we need to use origin_url
   // (which is an app url in case of app/extension) to scope the tags
   // in the given profile.
   for (NotificationMap::iterator iter = profile_notifications_.begin();
        iter != profile_notifications_.end(); ++iter) {
     ProfileNotification* old_notification = (*iter).second;
     if (old_notification->notification().tag() == tag &&
         old_notification->notification().origin_url() == origin_url &&
-        old_notification->profile() == profile) {
+        old_notification->profile_id() ==
+            NotificationUIManager::GetProfileID(profile)) {
       // Changing the type from non-progress to progress does not count towards
       // the immediate update allowed in the message center.
       std::string old_id = old_notification->notification().id();
 
       // Add/remove notification in the local list but just update the same
       // one in MessageCenter.
       delete old_notification;
       profile_notifications_.erase(old_id);
-      ProfileNotification* new_notification =
-          new ProfileNotification(profile, notification);
+      ProfileNotification* new_notification = new ProfileNotification(
+          NotificationUIManager::GetProfileID(profile), notification);
       profile_notifications_[new_notification->notification().id()] =
           new_notification;
 
       // TODO(liyanhou): Add routing updated notifications to alternative
       // providers.
 
       // WARNING: You MUST use AddProfileNotification or update the message
       // center via the notification within a ProfileNotification object or the
       // profile ID will not be correctly set for ChromeOS.
       message_center_->UpdateNotification(
@@ skipping 38 matching lines @@
     return false;
 
   RemoveProfileNotification(iter->second);
   message_center_->RemoveNotification(profile_notification_id,
                                       /* by_user */ false);
   return true;
 }
 
 std::set<std::string>
 MessageCenterNotificationManager::GetAllIdsByProfileAndSourceOrigin(
-    Profile* profile,
+    ProfileID profile_id,
     const GURL& source) {
-  // The profile pointer can be weak, the instance may have been destroyed, so
-  // no profile method should be called inside this function.
-
   std::set<std::string> delegate_ids;
   for (const auto& pair : profile_notifications_) {
     const Notification& notification = pair.second->notification();
-    if (pair.second->profile() == profile &&
+    if (pair.second->profile_id() == profile_id &&
         notification.origin_url() == source) {
       delegate_ids.insert(notification.delegate_id());
     }
   }
 
   return delegate_ids;
 }
 
 std::set<std::string> MessageCenterNotificationManager::GetAllIdsByProfile(
-    Profile* profile) {
-  // The profile pointer can be weak, the instance may have been destroyed, so
-  // no profile method should be called inside this function.
-
+    ProfileID profile_id) {
   std::set<std::string> delegate_ids;
   for (const auto& pair : profile_notifications_) {
-    if (pair.second->profile() == profile)
+    if (pair.second->profile_id() == profile_id)
       delegate_ids.insert(pair.second->notification().delegate_id());
   }
 
   return delegate_ids;
 }
 
 bool MessageCenterNotificationManager::CancelAllBySourceOrigin(
     const GURL& source) {
   // Same pattern as CancelById, but more complicated than the above
   // because there may be multiple notifications from the same source.
@@ skipping 13 matching lines @@
 }
 
 bool MessageCenterNotificationManager::CancelAllByProfile(
     ProfileID profile_id) {
   // Same pattern as CancelAllBySourceOrigin.
   bool removed = false;
 
   for (NotificationMap::iterator loopiter = profile_notifications_.begin();
        loopiter != profile_notifications_.end(); ) {
     NotificationMap::iterator curiter = loopiter++;
-    if (profile_id == NotificationUIManager::GetProfileID(
-            (*curiter).second->profile())) {
+    if (profile_id == (*curiter).second->profile_id()) {
       const std::string id = curiter->first;
       RemoveProfileNotification(curiter->second);
       message_center_->RemoveNotification(id, /* by_user */ false);
       removed = true;
     }
   }
   return removed;
 }
 
 void MessageCenterNotificationManager::CancelAll() {
@@ skipping 53 matching lines @@
     const std::string& delegate_id,
     Profile* profile) {
   return ProfileNotification::GetProfileNotificationId(delegate_id,
                                                        GetProfileID(profile));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // private
 
 void MessageCenterNotificationManager::AddNotificationToAlternateProvider(
-    ProfileNotification* profile_notification,
+    const Notification& notification,
+    Profile* profile,
     const std::string& extension_id) const {
-  const Notification& notification = profile_notification->notification();
-
   // Convert data from Notification type to NotificationOptions type.
   extensions::api::notifications::NotificationOptions options;
   NotificationConversionHelper::NotificationToNotificationOptions(notification,
                                                                   &options);
 
   // Send the notification to the alternate provider extension/app.
-  extensions::NotificationProviderEventRouter event_router(
-      profile_notification->profile());
+  extensions::NotificationProviderEventRouter event_router(profile);
   event_router.CreateNotification(extension_id,
                                   notification.notifier_id().id,
                                   notification.delegate_id(),
                                   options);
 }
 
 void MessageCenterNotificationManager::AddProfileNotification(
     ProfileNotification* profile_notification) {
   const Notification& notification = profile_notification->notification();
   std::string id = notification.id();
@@ skipping 32 matching lines @@
        it != registry->enabled_extensions().end();
        ++it) {
     if ((*it->get()).permissions_data()->HasAPIPermission(
             extensions::APIPermission::ID::kNotificationProvider)) {
       extension_id = (*it->get()).id();
       return extension_id;
     }
   }
   return extension_id;
 }