Remove balloon notification code. The last user was the Linux GTK port but that's deleted now.

chrome/browser/notifications/notification_browsertest.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 <deque>
 #include <string>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/infobars/confirm_infobar_delegate.h"
 #include "chrome/browser/infobars/infobar.h"
 #include "chrome/browser/infobars/infobar_service.h"
-#include "chrome/browser/notifications/balloon.h"
-#include "chrome/browser/notifications/balloon_collection.h"
-#include "chrome/browser/notifications/balloon_host.h"
-#include "chrome/browser/notifications/balloon_notification_ui_manager.h"
 #include "chrome/browser/notifications/desktop_notification_service.h"
 #include "chrome/browser/notifications/desktop_notification_service_factory.h"
 #include "chrome/browser/notifications/notification.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/content_settings.h"
 #include "chrome/common/content_settings_pattern.h"
@@ skipping 76 matching lines @@
     if (message_loop_runner_.get())
       message_loop_runner_->Quit();
   }
 
   bool notification_received_;
   scoped_refptr<content::MessageLoopRunner> message_loop_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(MessageCenterChangeObserver);
 };
 
-class NotificationBalloonChangeObserver
-    : public content::NotificationObserver,
-      public NotificationChangeObserver {
- public:
-  NotificationBalloonChangeObserver()
-      : collection_(BalloonNotificationUIManager::GetInstanceForTesting()->
-            balloon_collection()),
-        collection_changed_(false),
-        notification_received_(false),
-        running_(false),
-        done_(false) {
-    registrar_.Add(this, chrome::NOTIFICATION_NOTIFY_BALLOON_CONNECTED,
-                   content::NotificationService::AllSources());
-    registrar_.Add(this, chrome::NOTIFICATION_NOTIFY_BALLOON_DISCONNECTED,
-                   content::NotificationService::AllSources());
-    collection_->set_on_collection_changed_callback(
-        base::Bind(&NotificationBalloonChangeObserver::OnCollectionChanged,
-                   base::Unretained(this)));
-  }
-
-  virtual ~NotificationBalloonChangeObserver() {
-    collection_->set_on_collection_changed_callback(base::Closure());
-  }
-
-  // NotificationChangeObserver:
-  virtual bool Wait() OVERRIDE {
-    if (!Check()) {
-      running_ = true;
-      message_loop_runner_ = new content::MessageLoopRunner;
-      message_loop_runner_->Run();
-      EXPECT_TRUE(done_);
-    }
-    return done_;
-  }
-
-  bool Check() {
-    if (done_)
-      return true;
-
-    if (collection_changed_ && notification_received_) {
-      done_ = true;
-      if (running_) {
-        message_loop_runner_->Quit();
-        running_ = false;
-      }
-    }
-    return done_;
-  }
-
-  void OnCollectionChanged() {
-    collection_changed_ = true;
-    Check();
-  }
-
-  // content::NotificationObserver:
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE {
-    DCHECK(type == chrome::NOTIFICATION_NOTIFY_BALLOON_DISCONNECTED ||
-           type == chrome::NOTIFICATION_NOTIFY_BALLOON_CONNECTED);
-    notification_received_ = true;
-    Check();
-  }
-
- private:
-  content::NotificationRegistrar registrar_;
-  BalloonCollection* collection_;
-
-  bool collection_changed_;
-  bool notification_received_;
-  bool running_;
-  bool done_;
-  scoped_refptr<content::MessageLoopRunner> message_loop_runner_;
-
-  DISALLOW_COPY_AND_ASSIGN(NotificationBalloonChangeObserver);
-};
-
 }  // namespace
 
 class NotificationsTest : public InProcessBrowserTest {
  public:
   NotificationsTest() {}
 
  protected:
   int GetNotificationCount();
 
-  NotificationChangeObserver* CreateObserver();
-
   void CloseBrowserWindow(Browser* browser);
   void CrashTab(Browser* browser, int index);
-  const std::deque<Balloon*>& GetActiveBalloons();
-  void CrashNotification(Balloon* balloon);
-  bool CloseNotificationAndWait(const Notification& notification);
 
   void SetDefaultPermissionSetting(ContentSetting setting);
   void DenyOrigin(const GURL& origin);
   void AllowOrigin(const GURL& origin);
   void AllowAllOrigins();
 
   void VerifyInfoBar(const Browser* browser, int index);
   std::string CreateNotification(Browser* browser,
                                  bool wait_for_new_balloon,
                                  const char* icon,
@@ skipping 17 matching lines @@
     return embedded_test_server()->GetURL(
       "/notifications/notification_tester.html");
   }
 
  private:
   void DropOriginPreference(const GURL& origin);
   DesktopNotificationService* GetDesktopNotificationService();
 };
 
 int NotificationsTest::GetNotificationCount() {
-  if (message_center::IsRichNotificationEnabled()) {
-    return message_center::MessageCenter::Get()->NotificationCount();
-  } else {
-    return BalloonNotificationUIManager::GetInstanceForTesting()->
-           balloon_collection()->GetActiveBalloons().size();
-  }
-}
-
-NotificationChangeObserver* NotificationsTest::CreateObserver() {
-  if (message_center::IsRichNotificationEnabled())
-    return new MessageCenterChangeObserver();
-  else
-    return new NotificationBalloonChangeObserver();
+  return message_center::MessageCenter::Get()->NotificationCount();
 }
 
 void NotificationsTest::CloseBrowserWindow(Browser* browser) {
   content::WindowedNotificationObserver observer(
       chrome::NOTIFICATION_BROWSER_CLOSED,
       content::Source<Browser>(browser));
   browser->window()->Close();
   observer.Wait();
 }
 
 void NotificationsTest::CrashTab(Browser* browser, int index) {
   content::CrashTab(browser->tab_strip_model()->GetWebContentsAt(index));
 }
 
-const std::deque<Balloon*>& NotificationsTest::GetActiveBalloons() {
-  return BalloonNotificationUIManager::GetInstanceForTesting()->
-      balloon_collection()->GetActiveBalloons();
-}
-
-void NotificationsTest::CrashNotification(Balloon* balloon) {
-  content::CrashTab(balloon->balloon_view()->GetHost()->web_contents());
-}
-
-bool NotificationsTest::CloseNotificationAndWait(
-    const Notification& notification) {
-  scoped_ptr<NotificationChangeObserver> observer(CreateObserver());
-  bool success = g_browser_process->notification_ui_manager()->
-      CancelById(notification.notification_id());
-  if (success)
-    return observer->Wait();
-  return false;
-}
-
 void NotificationsTest::SetDefaultPermissionSetting(ContentSetting setting) {
   DesktopNotificationService* service = GetDesktopNotificationService();
   service->SetDefaultContentSetting(setting);
 }
 
 void NotificationsTest::DenyOrigin(const GURL& origin) {
   DropOriginPreference(origin);
   GetDesktopNotificationService()->DenyPermission(origin);
 }
 
@@ skipping 25 matching lines @@
     Browser* browser,
     bool wait_for_new_balloon,
     const char* icon,
     const char* title,
     const char* body,
     const char* replace_id) {
   std::string script = base::StringPrintf(
       "createNotification('%s', '%s', '%s', '%s');",
       icon, title, body, replace_id);
 
-  scoped_ptr<NotificationChangeObserver> observer(CreateObserver());
+  MessageCenterChangeObserver observer;
   std::string result;
   bool success = content::ExecuteScriptAndExtractString(
       browser->tab_strip_model()->GetActiveWebContents(),
       script,
       &result);
   if (success && result != "-1" && wait_for_new_balloon)
-    success = observer->Wait();
+    success = observer.Wait();
   EXPECT_TRUE(success);
 
   return result;
 }
 
 std::string NotificationsTest::CreateSimpleNotification(
     Browser* browser,
     bool wait_for_new_balloon) {
   return CreateNotification(
       browser, wait_for_new_balloon,
@@ skipping 17 matching lines @@
   return true;
 }
 
 bool NotificationsTest::CancelNotification(
     const char* notification_id,
     Browser* browser) {
   std::string script = base::StringPrintf(
       "cancelNotification('%s');",
       notification_id);
 
-  scoped_ptr<NotificationChangeObserver> observer(CreateObserver());
+  MessageCenterChangeObserver observer;
   std::string result;
   bool success = content::ExecuteScriptAndExtractString(
       browser->tab_strip_model()->GetActiveWebContents(),
       script,
       &result);
   if (!success || result != "1")
     return false;
-  return observer->Wait();
+  return observer.Wait();
 }
 
 bool NotificationsTest::PerformActionOnInfoBar(
     Browser* browser,
     InfobarAction action,
     size_t infobar_index,
     int tab_index) {
   InfoBarService* infobar_service = InfoBarService::FromWebContents(
       browser->tab_strip_model()->GetWebContentsAt(tab_index));
   if (infobar_index >= infobar_service->infobar_count()) {
@@ skipping 116 matching lines @@
 
   // Creates a simple notification.
   AllowAllOrigins();
   ui_test_utils::NavigateToURL(browser(), GetTestPageURL());
 
   std::string result = CreateSimpleNotification(browser(), true);
   EXPECT_NE("-1", result);
 
   GURL EXPECTED_ICON_URL = embedded_test_server()->GetURL(kExpectedIconUrl);
   ASSERT_EQ(1, GetNotificationCount());
-  if (message_center::IsRichNotificationEnabled()) {
-    message_center::NotificationList::Notifications notifications =
-        message_center::MessageCenter::Get()->GetVisibleNotifications();
-    EXPECT_EQ(base::ASCIIToUTF16("My Title"),
-              (*notifications.rbegin())->title());
-    EXPECT_EQ(base::ASCIIToUTF16("My Body"),
-              (*notifications.rbegin())->message());
-  } else {
-    const std::deque<Balloon*>& balloons = GetActiveBalloons();
-    ASSERT_EQ(1U, balloons.size());
-    Balloon* balloon = balloons[0];
-    const Notification& notification = balloon->notification();
-    EXPECT_EQ(EXPECTED_ICON_URL, notification.icon_url());
-    EXPECT_EQ(base::ASCIIToUTF16("My Title"), notification.title());
-    EXPECT_EQ(base::ASCIIToUTF16("My Body"), notification.message());
-  }
+  message_center::NotificationList::Notifications notifications =
+      message_center::MessageCenter::Get()->GetVisibleNotifications();
+  EXPECT_EQ(base::ASCIIToUTF16("My Title"),
+            (*notifications.rbegin())->title());
+  EXPECT_EQ(base::ASCIIToUTF16("My Body"),
+            (*notifications.rbegin())->message());
 }
 
 IN_PROC_BROWSER_TEST_F(NotificationsTest, TestCloseNotification) {
   ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
 
   // Creates a notification and closes it.
   AllowAllOrigins();
   ui_test_utils::NavigateToURL(browser(), GetTestPageURL());
 
   std::string result = CreateSimpleNotification(browser(), true);
   EXPECT_NE("-1", result);
   ASSERT_EQ(1, GetNotificationCount());
 
-  if (message_center::IsRichNotificationEnabled()) {
-    message_center::NotificationList::Notifications notifications =
-        message_center::MessageCenter::Get()->GetVisibleNotifications();
-    message_center::MessageCenter::Get()->RemoveNotification(
-        (*notifications.rbegin())->id(),
-        true);  // by_user
-  } else {
-    const std::deque<Balloon*>& balloons = GetActiveBalloons();
-    EXPECT_TRUE(CloseNotificationAndWait(balloons[0]->notification()));
-  }
+  message_center::NotificationList::Notifications notifications =
+      message_center::MessageCenter::Get()->GetVisibleNotifications();
+  message_center::MessageCenter::Get()->RemoveNotification(
+      (*notifications.rbegin())->id(),
+      true);  // by_user
 
   ASSERT_EQ(0, GetNotificationCount());
 }
 
 IN_PROC_BROWSER_TEST_F(NotificationsTest, TestCancelNotification) {
   ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
 
   // Creates a notification and cancels it in the origin page.
   AllowAllOrigins();
   ui_test_utils::NavigateToURL(browser(), GetTestPageURL());
@@ skipping 154 matching lines @@
   ui_test_utils::NavigateToURL(browser(), GetTestPageURL());
   CreateSimpleNotification(browser(), true);
   ASSERT_EQ(1, GetNotificationCount());
 
   DenyOrigin(GetTestPageURL().GetOrigin());
   ContentSettingsForOneType settings;
   GetPrefsByContentSetting(CONTENT_SETTING_BLOCK, &settings);
   ASSERT_TRUE(CheckOriginInSetting(settings, GetTestPageURL().GetOrigin()));
 
   EXPECT_EQ(1, GetNotificationCount());
-  if (message_center::IsRichNotificationEnabled()) {
-    message_center::NotificationList::Notifications notifications =
-        message_center::MessageCenter::Get()->GetVisibleNotifications();
-    message_center::MessageCenter::Get()->RemoveNotification(
-        (*notifications.rbegin())->id(),
-        true);  // by_user
-  } else {
-    const std::deque<Balloon*>& balloons = GetActiveBalloons();
-    ASSERT_TRUE(CloseNotificationAndWait(balloons[0]->notification()));
-  }
+  message_center::NotificationList::Notifications notifications =
+      message_center::MessageCenter::Get()->GetVisibleNotifications();
+  message_center::MessageCenter::Get()->RemoveNotification(
+      (*notifications.rbegin())->id(),
+      true);  // by_user
   ASSERT_EQ(0, GetNotificationCount());
 }
 
 // Crashes on Linux/Win. See http://crbug.com/160657.
 IN_PROC_BROWSER_TEST_F(
     NotificationsTest,
     DISABLED_TestOriginPrefsNotSavedInIncognito) {
   ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
 
   // Verify that allow/deny origin preferences are not saved in incognito.
@@ skipping 47 matching lines @@
       browser(),
       embedded_test_server()->GetURL("/empty.html"),
       NEW_BACKGROUND_TAB,
       ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB);
   browser()->tab_strip_model()->ActivateTabAt(0, true);
   ui_test_utils::NavigateToURL(browser(), GetTestPageURL());
   ASSERT_TRUE(RequestPermissionAndWait(browser()));
   CrashTab(browser(), 0);
 }
 
-IN_PROC_BROWSER_TEST_F(NotificationsTest, TestKillNotificationProcess) {
-  // Notifications don't have their own process with the message center.
-  if (message_center::IsRichNotificationEnabled())
-    return;
-
-  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
-
-  // Test killing a notification doesn't crash Chrome.
-  AllowAllOrigins();
-  ui_test_utils::NavigateToURL(browser(), GetTestPageURL());
-  CreateSimpleNotification(browser(), true);
-  ASSERT_EQ(1, GetNotificationCount());
-
-  const std::deque<Balloon*>& balloons = GetActiveBalloons();
-  ASSERT_EQ(1U, balloons.size());
-  CrashNotification(balloons[0]);
-  ASSERT_EQ(0, GetNotificationCount());
-}
-
 IN_PROC_BROWSER_TEST_F(NotificationsTest, TestIncognitoNotification) {
   ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
 
   // Test notifications in incognito window.
   Browser* browser = CreateIncognitoBrowser();
   ui_test_utils::NavigateToURL(browser, GetTestPageURL());
   browser->tab_strip_model()->ActivateTabAt(0, true);
   ASSERT_TRUE(RequestPermissionAndWait(browser));
   PerformActionOnInfoBar(browser, ALLOW, 0, 0);
   CreateSimpleNotification(browser, true);
@@ skipping 80 matching lines @@
   std::string result = CreateNotification(
       browser(), true, "abc.png", "Title1", "Body1", "chat");
   EXPECT_NE("-1", result);
 
   ASSERT_EQ(1, GetNotificationCount());
 
   result = CreateNotification(
       browser(), false, "no_such_file.png", "Title2", "Body2", "chat");
   EXPECT_NE("-1", result);
 
-  if (message_center::IsRichNotificationEnabled()) {
-    ASSERT_EQ(1, GetNotificationCount());
-    message_center::NotificationList::Notifications notifications =
-        message_center::MessageCenter::Get()->GetVisibleNotifications();
-    EXPECT_EQ(base::ASCIIToUTF16("Title2"), (*notifications.rbegin())->title());
-    EXPECT_EQ(base::ASCIIToUTF16("Body2"),
-              (*notifications.rbegin())->message());
-  } else {
-    const std::deque<Balloon*>& balloons = GetActiveBalloons();
-    ASSERT_EQ(1U, balloons.size());
-    Balloon* balloon = balloons[0];
-    const Notification& notification = balloon->notification();
-    GURL EXPECTED_ICON_URL = embedded_test_server()->GetURL(kExpectedIconUrl);
-    EXPECT_EQ(EXPECTED_ICON_URL, notification.icon_url());
-    EXPECT_EQ(base::ASCIIToUTF16("Title2"), notification.title());
-    EXPECT_EQ(base::ASCIIToUTF16("Body2"), notification.message());
-  }
+  ASSERT_EQ(1, GetNotificationCount());
+  message_center::NotificationList::Notifications notifications =
+      message_center::MessageCenter::Get()->GetVisibleNotifications();
+  EXPECT_EQ(base::ASCIIToUTF16("Title2"), (*notifications.rbegin())->title());
+  EXPECT_EQ(base::ASCIIToUTF16("Body2"),
+            (*notifications.rbegin())->message());
 }