Notificaitons refactor step 2

chrome/browser/ui/views/message_center/web_notification_tray_win_browsertest.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 "chrome/browser/ui/views/message_center/web_notification_tray_win.h"
 
 #include <set>
 
 #include "ash/root_window_controller.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/system/tray/system_tray_item.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "content/public/test/test_utils.h"
 #include "ui/message_center/message_center_bubble.h"
 #include "ui/message_center/message_center_tray.h"
 #include "ui/message_center/message_popup_bubble.h"
 #include "ui/message_center/notification_list.h"
-#include "ui/notifications/notification_types.h"
+#include "ui/message_center/notification_types.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 namespace message_center {
 
 namespace {
 
 class TestDelegate : public message_center::MessageCenter::Delegate {
@@ skipping 20 matching lines @@
 
   virtual void DisableExtension(const std::string& notification_id) OVERRIDE { }
   virtual void ShowSettings(const std::string& notification_id) OVERRIDE { }
   virtual void OnClicked(const std::string& notification_id) OVERRIDE { }
   virtual void ShowSettingsDialog(gfx::NativeView context) OVERRIDE { }
 
 
   void AddNotification(const std::string& id) {
     notification_ids_.insert(id);
     message_center_->AddNotification(
-        ui::notifications::NOTIFICATION_TYPE_SIMPLE,
+        message_center::NOTIFICATION_TYPE_SIMPLE,
         id,
         ASCIIToUTF16("Test Web Notification"),
         ASCIIToUTF16("Notification message body."),
         ASCIIToUTF16("www.test.org"),
         "" /* extension id */,
         NULL /* optional_fields */);
   }
 
   void UpdateNotification(const std::string& old_id,
                           const std::string& new_id) {
@@ skipping 133 matching lines @@
   EXPECT_TRUE(tray->message_center_tray_->popups_visible());
   EXPECT_EQ(notifications_to_add,
             message_center->NotificationCount());
   EXPECT_EQ(NotificationList::kMaxVisiblePopupNotifications,
             tray->GetPopupBubbleForTest()->NumMessageViewsForTest());
   message_center->SetDelegate(NULL);
   message_center->notification_list()->RemoveAllNotifications();
 }
 
 }  // namespace message_center