Rename gfx::Display/Screen to display::Display/Screen in message_center

ui/message_center/views/message_popup_collection_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/views/message_popup_collection.h"
 
 #include <stddef.h>
 
 #include <list>
 #include <utility>
 
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/display/display.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/event_utils.h"
-#include "ui/gfx/display.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/message_center/fake_message_center.h"
 #include "ui/message_center/views/desktop_popup_alignment_delegate.h"
 #include "ui/message_center/views/toast_contents_view.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
 namespace message_center {
 namespace test {
@@ skipping 37 matching lines @@
     views::Widget* widget = collection_->GetWidgetForTest(id);
     return widget && widget->IsVisible();
   }
 
   views::Widget* GetWidget(const std::string& id) {
     return collection_->GetWidgetForTest(id);
   }
 
   void SetDisplayInfo(const gfx::Rect& work_area,
                       const gfx::Rect& display_bounds) {
-    gfx::Display dummy_display;
+    display::Display dummy_display;
     dummy_display.set_bounds(display_bounds);
     dummy_display.set_work_area(work_area);
     alignment_delegate_->RecomputeAlignment(dummy_display);
     PrepareForWait();
   }
 
   gfx::Rect GetWorkArea() {
     return alignment_delegate_->work_area_;
   }
 
@@ skipping 426 matching lines @@
   // Confirms that there is no toast.
   EXPECT_EQ(0u, GetToastCounts());
   // But the notification still exists.
   EXPECT_EQ(1u, MessageCenter::Get()->NotificationCount());
 }
 
 #endif  // defined(OS_CHROMEOS)
 
 }  // namespace test
 }  // namespace message_center