Notificaitons refactor step 2

ui/message_center/message_center_tray_unittest.cc

 // Copyright (c) 2013 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 "ui/message_center/message_center_tray.h"
 
 #include "base/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/message_center/message_center.h"
-#include "ui/notifications/notification_types.h"
+#include "ui/message_center/notification_types.h"
 
 namespace message_center {
 namespace {
 
 class MockDelegate : public MessageCenterTrayDelegate {
  public:
   MockDelegate()
       : show_popups_success_(true),
         show_message_center_success_(true) {}
   virtual ~MockDelegate() {}
@@ skipping 74 matching lines @@
 TEST_F(MessageCenterTrayTest, BasicPopup) {
   ASSERT_FALSE(message_center_tray_->popups_visible());
   ASSERT_FALSE(message_center_tray_->message_center_visible());
 
   message_center_tray_->ShowPopupBubble();
 
   ASSERT_FALSE(message_center_tray_->popups_visible());
   ASSERT_FALSE(message_center_tray_->message_center_visible());
 
   message_center_->AddNotification(
-      ui::notifications::NOTIFICATION_TYPE_SIMPLE,
+      message_center::NOTIFICATION_TYPE_SIMPLE,
       "BasicPopup",
       ASCIIToUTF16("Test Web Notification"),
       ASCIIToUTF16("Notification message body."),
       ASCIIToUTF16("www.test.org"),
       "" /* extension id */,
       NULL /* optional_fields */);
 
   ASSERT_TRUE(message_center_tray_->popups_visible());
   ASSERT_FALSE(message_center_tray_->message_center_visible());
 
   message_center_tray_->HidePopupBubble();
 
   ASSERT_FALSE(message_center_tray_->popups_visible());
   ASSERT_FALSE(message_center_tray_->message_center_visible());
 }
 
 TEST_F(MessageCenterTrayTest, MessageCenterClosesPopups) {
   ASSERT_FALSE(message_center_tray_->popups_visible());
   ASSERT_FALSE(message_center_tray_->message_center_visible());
 
   message_center_->AddNotification(
-      ui::notifications::NOTIFICATION_TYPE_SIMPLE,
+      message_center::NOTIFICATION_TYPE_SIMPLE,
       "MessageCenterClosesPopups",
       ASCIIToUTF16("Test Web Notification"),
       ASCIIToUTF16("Notification message body."),
       ASCIIToUTF16("www.test.org"),
       "" /* extension id */,
       NULL /* optional_fields */);
 
   ASSERT_TRUE(message_center_tray_->popups_visible());
   ASSERT_FALSE(message_center_tray_->message_center_visible());
 
   bool shown = message_center_tray_->ShowMessageCenterBubble();
   EXPECT_TRUE(shown);
 
   ASSERT_FALSE(message_center_tray_->popups_visible());
   ASSERT_TRUE(message_center_tray_->message_center_visible());
 
   message_center_->AddNotification(
-      ui::notifications::NOTIFICATION_TYPE_SIMPLE,
+      message_center::NOTIFICATION_TYPE_SIMPLE,
       "MessageCenterClosesPopups2",
       ASCIIToUTF16("Test Web Notification"),
       ASCIIToUTF16("Notification message body."),
       ASCIIToUTF16("www.test.org"),
       "" /* extension id */,
       NULL /* optional_fields */);
 
   message_center_tray_->ShowPopupBubble();
 
   ASSERT_FALSE(message_center_tray_->popups_visible());
   ASSERT_TRUE(message_center_tray_->message_center_visible());
 
   message_center_tray_->HideMessageCenterBubble();
 
   ASSERT_FALSE(message_center_tray_->popups_visible());
   ASSERT_FALSE(message_center_tray_->message_center_visible());
 }
 
 TEST_F(MessageCenterTrayTest, ShowBubbleFails) {
   // Now the delegate will signal that it was unable to show a bubble.
   delegate_->show_popups_success_ = false;
   delegate_->show_message_center_success_ = false;
 
   ASSERT_FALSE(message_center_tray_->popups_visible());
   ASSERT_FALSE(message_center_tray_->message_center_visible());
 
   message_center_->AddNotification(
-      ui::notifications::NOTIFICATION_TYPE_SIMPLE,
+      message_center::NOTIFICATION_TYPE_SIMPLE,
       "ShowBubbleFails",
       ASCIIToUTF16("Test Web Notification"),
       ASCIIToUTF16("Notification message body."),
       ASCIIToUTF16("www.test.org"),
       "" /* extension id */,
       NULL /* optional_fields */);
 
   message_center_tray_->ShowPopupBubble();
 
   ASSERT_FALSE(message_center_tray_->popups_visible());
@@ skipping 15 matching lines @@
   ASSERT_FALSE(message_center_tray_->popups_visible());
   ASSERT_FALSE(message_center_tray_->message_center_visible());
 
   message_center_tray_->HidePopupBubble();
 
   ASSERT_FALSE(message_center_tray_->popups_visible());
   ASSERT_FALSE(message_center_tray_->message_center_visible());
 }
 
 }  // namespace message_center