Rename gfx::Display/Screen to display::Display/Screen in chromecast/blimp/media

blimp/engine/app/ui/blimp_screen_unittest.cc

Index: blimp/engine/app/ui/blimp_screen_unittest.cc
diff --git a/blimp/engine/app/ui/blimp_screen_unittest.cc b/blimp/engine/app/ui/blimp_screen_unittest.cc
index 09244de901fd397b49d7334473b4701dff76a7d7..9753fefe946c2e53439234fb016e2f68ddabf002 100644
--- a/blimp/engine/app/ui/blimp_screen_unittest.cc
+++ b/blimp/engine/app/ui/blimp_screen_unittest.cc
@@ -16,9 +16,9 @@
 #include "blimp/engine/app/switches.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/gfx/display.h"
-#include "ui/gfx/display_observer.h"
-#include "ui/gfx/screen.h"
+#include "ui/display/display.h"
+#include "ui/display/display_observer.h"
+#include "ui/display/screen.h"
 
 using testing::InSequence;
 
@@ -26,20 +26,20 @@ namespace blimp {
 namespace engine {
 namespace {
 
-// Checks if two gfx::Displays have the ID.
+// Checks if two display::Displays have the ID.
 MATCHER_P(EqualsDisplay, display, "") {
   return display.id() == arg.id();
 }
 
-class MockDisplayObserver : public gfx::DisplayObserver {
+class MockDisplayObserver : public display::DisplayObserver {
  public:
   MockDisplayObserver() {}
   ~MockDisplayObserver() override {}
 
-  MOCK_METHOD1(OnDisplayAdded, void(const gfx::Display&));
-  MOCK_METHOD1(OnDisplayRemoved, void(const gfx::Display&));
+  MOCK_METHOD1(OnDisplayAdded, void(const display::Display&));
+  MOCK_METHOD1(OnDisplayRemoved, void(const display::Display&));
   MOCK_METHOD2(OnDisplayMetricsChanged,
-               void(const gfx::Display& display, uint32_t changed_metrics));
+               void(const display::Display& display, uint32_t changed_metrics));
 };
 
 class BlimpScreenTest : public testing::Test {
@@ -58,8 +58,8 @@ class BlimpScreenTest : public testing::Test {
 TEST_F(BlimpScreenTest, ObserversAreInfomed) {
   auto display = screen_->GetPrimaryDisplay();
   uint32_t changed_metrics =
-      gfx::DisplayObserver::DISPLAY_METRIC_DEVICE_SCALE_FACTOR |
-      gfx::DisplayObserver::DISPLAY_METRIC_BOUNDS;
+      display::DisplayObserver::DISPLAY_METRIC_DEVICE_SCALE_FACTOR |
+      display::DisplayObserver::DISPLAY_METRIC_BOUNDS;
 
   InSequence s;
   EXPECT_CALL(observer1_,
@@ -67,13 +67,14 @@ TEST_F(BlimpScreenTest, ObserversAreInfomed) {
   EXPECT_CALL(observer2_,
               OnDisplayMetricsChanged(EqualsDisplay(display), changed_metrics));
 
-  changed_metrics = gfx::DisplayObserver::DISPLAY_METRIC_BOUNDS;
+  changed_metrics = display::DisplayObserver::DISPLAY_METRIC_BOUNDS;
   EXPECT_CALL(observer1_,
               OnDisplayMetricsChanged(EqualsDisplay(display), changed_metrics));
   EXPECT_CALL(observer2_,
               OnDisplayMetricsChanged(EqualsDisplay(display), changed_metrics));
 
-  changed_metrics = gfx::DisplayObserver::DISPLAY_METRIC_DEVICE_SCALE_FACTOR;
+  changed_metrics =
+      display::DisplayObserver::DISPLAY_METRIC_DEVICE_SCALE_FACTOR;
   EXPECT_CALL(observer1_,
               OnDisplayMetricsChanged(EqualsDisplay(display), changed_metrics));
   EXPECT_CALL(observer2_,
@@ -99,8 +100,8 @@ TEST_F(BlimpScreenTest, RemoveObserver) {
   screen_->RemoveObserver(&observer2_);
   auto display = screen_->GetPrimaryDisplay();
   uint32_t changed_metrics =
-      gfx::DisplayObserver::DISPLAY_METRIC_DEVICE_SCALE_FACTOR |
-      gfx::DisplayObserver::DISPLAY_METRIC_BOUNDS;
+      display::DisplayObserver::DISPLAY_METRIC_DEVICE_SCALE_FACTOR |
+      display::DisplayObserver::DISPLAY_METRIC_BOUNDS;
   EXPECT_CALL(observer1_,
               OnDisplayMetricsChanged(EqualsDisplay(display), changed_metrics));