Plumb NotifierId to status icon balloons

chrome/browser/status_icons/desktop_notification_balloon.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/status_icons/desktop_notification_balloon.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 15 matching lines @@
   // The browser process may have gone away during shutting down, in this case
   // notification_ui_manager() will close the balloon in its destructor.
   if (!g_browser_process)
     return;
 
   g_browser_process->notification_ui_manager()->CancelById(id, profile_id);
 }
 
 // Prefix added to the notification ids.
 const char kNotificationPrefix[] = "desktop_notification_balloon.";
-const char kNotifierId[] = "status-icons.desktop-notification-balloon";
 
 // Timeout for automatically dismissing the notification balloon.
 const size_t kTimeoutSeconds = 6;
 
 class DummyNotificationDelegate : public NotificationDelegate {
  public:
   explicit DummyNotificationDelegate(const std::string& id, Profile* profile)
       : id_(kNotificationPrefix + id), profile_(profile) {}
 
   void Display() override {
@@ skipping 20 matching lines @@
 
 DesktopNotificationBalloon::~DesktopNotificationBalloon() {
   if (!notification_id_.empty())
     CloseBalloon(notification_id_,
                  NotificationUIManager::GetProfileID(profile_));
 }
 
 void DesktopNotificationBalloon::DisplayBalloon(
     const gfx::ImageSkia& icon,
     const base::string16& title,
-    const base::string16& contents) {
+    const base::string16& contents,
+    const message_center::NotifierId& notifier_id) {
   // Allowing IO access is required here to cover the corner case where
   // there is no last used profile and the default one is loaded.
   // IO access won't be required for normal uses.
   Profile* profile;
   {
     base::ThreadRestrictions::ScopedAllowIO allow_io;
     profile = ProfileManager::GetLastUsedProfile();
   }
 
   NotificationDelegate* delegate =
       new DummyNotificationDelegate(base::IntToString(id_count_++), profile_);
-  // TODO(johnme): In theory the desktop notification balloon class can be used
-  // by lots of other features, which would not fall under a single system
-  // component id. So callers should pass in the notifier_id to be used here,
-  // see https://crbug.com/542232
   Notification notification(message_center::NOTIFICATION_TYPE_SIMPLE, title,
-      contents, gfx::Image(icon),
-      message_center::NotifierId(message_center::NotifierId::SYSTEM_COMPONENT,
-                                 kNotifierId),
-      base::string16(), GURL(), std::string(),
-      message_center::RichNotificationData(), delegate);
+      contents, gfx::Image(icon), notifier_id, base::string16(), GURL(),
+      std::string(), message_center::RichNotificationData(), delegate);
 
   g_browser_process->notification_ui_manager()->Add(notification, profile);
 
   notification_id_ = notification.delegate_id();
   profile_ = profile;
 }