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

chrome/browser/metrics/chrome_browser_main_extra_parts_metrics_unittest.cc

 // Copyright 2015 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/metrics/chrome_browser_main_extra_parts_metrics.h"
 
 #include <memory>
 
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/test/histogram_tester.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/display/screen.h"
 #include "ui/events/test/device_data_manager_test_api.h"
 #include "ui/gfx/geometry/size.h"
-#include "ui/gfx/screen.h"
 #include "ui/gfx/test/test_screen.h"
 
 namespace {
 
 const char kTouchEventsEnabledHistogramName[] =
     "Touchscreen.TouchEventsEnabled";
 
 }  // namespace
 
 class ChromeBrowserMainExtraPartsMetricsTest : public testing::Test {
@@ skipping 10 matching lines @@
   base::MessageLoop message_loop_;
 
   // Dummy screen required by a ChromeBrowserMainExtraPartsMetrics test target.
   gfx::test::TestScreen test_screen_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsMetricsTest);
 };
 
 ChromeBrowserMainExtraPartsMetricsTest::ChromeBrowserMainExtraPartsMetricsTest()
     : device_data_manager_test_api_() {
-  gfx::Screen::SetScreenInstance(&test_screen_);
+  display::Screen::SetScreenInstance(&test_screen_);
 }
 
 ChromeBrowserMainExtraPartsMetricsTest::
     ~ChromeBrowserMainExtraPartsMetricsTest() {
-  gfx::Screen::SetScreenInstance(nullptr);
+  display::Screen::SetScreenInstance(nullptr);
 }
 
 // Verify a TouchEventsEnabled value isn't recorded during construction.
 TEST_F(ChromeBrowserMainExtraPartsMetricsTest,
        VerifyTouchEventsEnabledIsNotRecordedAfterConstruction) {
   base::HistogramTester histogram_tester;
   ChromeBrowserMainExtraPartsMetrics test_target;
   histogram_tester.ExpectTotalCount(kTouchEventsEnabledHistogramName, 0);
 }
 
@@ skipping 56 matching lines @@
 TEST_F(ChromeBrowserMainExtraPartsMetricsTest,
        VerifyTouchEventsEnabledIsRecordedAfterPostBrowserStart) {
   base::HistogramTester histogram_tester;
   ChromeBrowserMainExtraPartsMetrics test_target;
 
   test_target.PostBrowserStart();
   histogram_tester.ExpectTotalCount(kTouchEventsEnabledHistogramName, 1);
 }
 
 #endif  // defined(USE_OZONE) || defined(USE_X11)