Merge two Notification constructors, increase priority of low-battery notification.

BUG=

Review URL: https://codereview.chromium.org/576823003

Cr-Commit-Position: refs/heads/master@{#295287}

chrome/browser/chromeos/power/peripheral_battery_observer.cc

@@ -216,17 +216,21 @@ bool PeripheralBatteryObserver::PostNotification(const std::string& address,
       battery.level);
 
   Notification notification(
-      // TODO(mukai): add SYSTEM priority and use here.
+      message_center::NOTIFICATION_TYPE_SIMPLE,
       GURL(kNotificationOriginUrl),
-      ui::ResourceBundle::GetSharedInstance().GetImageNamed(
-          IDR_NOTIFICATION_PERIPHERAL_BATTERY_LOW),
       base::UTF8ToUTF16(battery.name),
       string_text,
+      ui::ResourceBundle::GetSharedInstance().GetImageNamed(
+          IDR_NOTIFICATION_PERIPHERAL_BATTERY_LOW),
       blink::WebTextDirectionDefault,
+      message_center::NotifierId(GURL(kNotificationOriginUrl)),
       base::string16(),
       base::UTF8ToUTF16(address),
+      message_center::RichNotificationData(),
       new PeripheralBatteryNotificationDelegate(address));
 
+  notification.set_priority(message_center::SYSTEM_PRIORITY);
+
   notification_manager->Add(
       notification,
       ProfileManager::GetPrimaryUserProfile());

chrome/browser/notifications/desktop_notification_service.cc

@@ -88,9 +88,17 @@ std::string DesktopNotificationService::AddIconNotification(
     const base::string16& replace_id,
     NotificationDelegate* delegate,
     Profile* profile) {
-  Notification notification(origin_url, icon, title, message,
+  Notification notification(message_center::NOTIFICATION_TYPE_SIMPLE,
+                            origin_url,
+                            title,
+                            message,
+                            icon,
                             blink::WebTextDirectionDefault,
-                            base::string16(), replace_id, delegate);
+                            message_center::NotifierId(origin_url),
+                            base::string16(),
+                            replace_id,
+                            message_center::RichNotificationData(),
+                            delegate);
   g_browser_process->notification_ui_manager()->Add(notification, profile);
   return notification.delegate_id();
 }

chrome/browser/notifications/notification.cc

@@ -54,27 +54,6 @@ Notification::Notification(
   // to prevent "Downloading" the data url and overwriting the existing |icon|.
 }
 
-Notification::Notification(const GURL& origin_url,
-                           const gfx::Image& icon,
-                           const base::string16& title,
-                           const base::string16& body,
-                           blink::WebTextDirection dir,
-                           const base::string16& display_source,
-                           const base::string16& replace_id,
-                           NotificationDelegate* delegate)
-    : message_center::Notification(message_center::NOTIFICATION_TYPE_SIMPLE,
-                                   delegate->id(),
-                                   title,
-                                   body,
-                                   icon,
-                                   display_source,
-                                   message_center::NotifierId(origin_url),
-                                   message_center::RichNotificationData(),
-                                   delegate),
-      origin_url_(origin_url),
-      replace_id_(replace_id),
-      delegate_(delegate) {}
-
 Notification::Notification(const Notification& notification)
     : message_center::Notification(notification),
       origin_url_(notification.origin_url()),

chrome/browser/notifications/notification.h

@@ -38,17 +38,6 @@ class Notification : public message_center::Notification {
                const base::string16& replace_id,
                NotificationDelegate* delegate);
 
-  // Initializes a notification with text content and an icon image. Currently
-  // only used on Ash. Does not generate content_url_.
-  Notification(const GURL& origin_url,
-               const gfx::Image& icon,
-               const base::string16& title,
-               const base::string16& body,
-               blink::WebTextDirection dir,
-               const base::string16& display_source,
-               const base::string16& replace_id,
-               NotificationDelegate* delegate);
-
   Notification(
       message_center::NotificationType type,
       const GURL& origin_url,