Remove reference to deprecated notification type

NOTIFICATION_TYPE_SIMPLE has been removed from rich notifications.  So, we
should no longer rely on that constant.  While I am at it, I also cleaned
up a comment, and removed a reference to a unit test that we ended up not
using.

BUG=243959

Review URL: https://chromiumcodereview.appspot.com/16159002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203871 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/background/background_mode_manager.h

@@ -85,8 +85,6 @@ class BackgroundModeManager
                            ProfileInfoCacheStorage);
   FRIEND_TEST_ALL_PREFIXES(BackgroundModeManagerTest,
                            ProfileInfoCacheObserver);
-  FRIEND_TEST_ALL_PREFIXES(ExtensionServiceTest,
-                           ReloadBackroundExtension);
   class BackgroundModeData : public ui::SimpleMenuModel::Delegate {
    public:
     explicit BackgroundModeData(

chrome/browser/extensions/api/push_messaging/push_messaging_api.h

@@ -91,7 +91,7 @@ class PushMessagingGetChannelIdFunction
   scoped_ptr<ObfuscatedGaiaIdFetcher> fetcher_;
   bool interactive_;
 
-  // We use this to register for notifications if the logon attept succeeds.
+  // We use this to register for notifications if the login attempt succeeds.
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(PushMessagingGetChannelIdFunction);

chrome/browser/notifications/sync_notifier/synced_notification.cc

@@ -96,7 +96,7 @@ void SyncedNotification::Show(NotificationUIManager* notification_manager,
 
     // Deduce which notification template to use from the data.
     message_center::NotificationType notification_type =
-        message_center::NOTIFICATION_TYPE_SIMPLE;
+        message_center::NOTIFICATION_TYPE_BASE_FORMAT;
     if (!image_url.is_empty()) {
       notification_type = message_center::NOTIFICATION_TYPE_IMAGE;
     } else if (notification_count > 1) {