Moving notification types which are chrome specific to a new header file chrome_notification_type...

chrome/browser/chromeos/notifications/notification_browsertest.cc

 // Copyright (c) 2011 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 "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/notifications/balloon_collection_impl.h"
 #include "chrome/browser/chromeos/notifications/balloon_view.h"
 #include "chrome/browser/chromeos/notifications/notification_panel.h"
 #include "chrome/browser/chromeos/notifications/system_notification_factory.h"
 #include "chrome/browser/notifications/notification_test_util.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/test/in_process_browser_test.h"
 #include "chrome/test/ui_test_utils.h"
 #include "content/common/notification_service.h"
 #include "ui/base/x/x11_util.h"
 
 namespace {
 
 // The name of ChromeOS's window manager.
 const char* kChromeOsWindowManagerName = "chromeos-wm";
 
@@ skipping 73 matching lines @@
   }
 
   // Busy loop to wait until the webkit give some size to the notification.
   void WaitForResize(BalloonViewImpl* view) {
     while (view->bounds().IsEmpty()) {
       ui_test_utils::RunAllPendingInMessageLoop();
     }
   }
 
   // NotificationObserver overrides.
-  virtual void Observe(NotificationType type,
+  virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details) {
-    ASSERT_TRUE(NotificationType::PANEL_STATE_CHANGED == type);
+    ASSERT_TRUE(chrome::NOTIFICATION_PANEL_STATE_CHANGED == type);
     PanelController::State* state =
         reinterpret_cast<PanelController::State*>(details.map_key());
     state_ = *state;
     if (under_chromeos_ && expected_ == state_) {
       expected_ = PanelController::INITIAL;
       MessageLoop::current()->Quit();
     }
   }
 
  private:
@@ skipping 167 matching lines @@
 // -stale-> [STICKY_NEW] -remove-> [STICKY_NEW] -remove sys->
 // [MINIMIZED] -remove-> [CLOSED]
 //
 // This test depends on the fact that the panel state change occurs
 // quicker than stale timeout, thus the stale timeout cannot be set to
 // 0. This test explicitly controls the stale state instead.
 IN_PROC_BROWSER_TEST_F(NotificationTest, TestStateTransition2) {
   // Register observer here as the registration does not work in SetUp().
   NotificationRegistrar registrar;
   registrar.Add(this,
-                NotificationType::PANEL_STATE_CHANGED,
+                chrome::NOTIFICATION_PANEL_STATE_CHANGED,
                 NotificationService::AllSources());
 
   BalloonCollectionImpl* collection = GetBalloonCollectionImpl();
   NotificationPanel* panel = GetNotificationPanel();
   NotificationPanelTester* tester = panel->GetTester();
 
   // See description above.
   tester->SetStaleTimeout(100000);
 
   EXPECT_EQ(NotificationPanel::CLOSED, tester->state());
@@ skipping 46 matching lines @@
   ui_test_utils::RunAllPendingInMessageLoop();
   EXPECT_EQ(0, tester->GetNotificationCount());
   EXPECT_EQ(NotificationPanel::CLOSED, tester->state());
 
   ui_test_utils::RunAllPendingInMessageLoop();
 }
 
 IN_PROC_BROWSER_TEST_F(NotificationTest, TestCleanupOnExit) {
   NotificationRegistrar registrar;
   registrar.Add(this,
-                NotificationType::PANEL_STATE_CHANGED,
+                chrome::NOTIFICATION_PANEL_STATE_CHANGED,
                 NotificationService::AllSources());
 
   BalloonCollectionImpl* collection = GetBalloonCollectionImpl();
   NotificationPanel* panel = GetNotificationPanel();
   NotificationPanelTester* tester = panel->GetTester();
 
   // Don't become stale.
   tester->SetStaleTimeout(100000);
 
   collection->Add(NewMockNotification("1"), browser()->profile());
@@ skipping 212 matching lines @@
   EXPECT_TRUE(collection->AddWebUIMessageCallback(
       NewMockNotification("1"),
       "test",
       NewCallback(
           static_cast<NotificationTest*>(this),
           &NotificationTest::HandleWebUIMessage)));
   MessageLoop::current()->Run();
 }
 
 }  // namespace chromeos