Rename gfx::Display/Screen to display::Display/Screen in views/wm

ui/views/test/ui_controls_factory_desktop_aurax11.cc

 // Copyright 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 <X11/keysym.h>
 #include <X11/Xlib.h>
 
 // X macro fail.
 #if defined(RootWindow)
 #undef RootWindow
@@ skipping 212 matching lines @@
       marker_event->xclient.window = x_window_;
       marker_event->xclient.format = 8;
     }
     marker_event->xclient.message_type = MarkerEventAtom();
     XSendEvent(x_display_, x_window_, False, 0, marker_event);
     ui::PlatformEventWaiter::Create(closure, base::Bind(&Matcher));
   }
  private:
   aura::Window* RootWindowForPoint(const gfx::Point& point) {
     // Most interactive_ui_tests run inside of the aura_test_helper
-    // environment. This means that we can't rely on gfx::Screen and several
+    // environment. This means that we can't rely on display::Screen and several
     // other things to work properly. Therefore we hack around this by
     // iterating across the windows owned DesktopWindowTreeHostX11 since this
     // doesn't rely on having a DesktopScreenX11.
     std::vector<aura::Window*> windows =
         DesktopWindowTreeHostX11::GetAllOpenWindows();
     for (std::vector<aura::Window*>::const_iterator it = windows.begin();
          it != windows.end(); ++it) {
       if ((*it)->GetBoundsInScreen().Contains(point)) {
         return (*it)->GetRootWindow();
       }
@@ skipping 36 matching lines @@
 
 UIControlsAura* CreateUIControlsDesktopAura() {
   // The constructor of UIControlsDesktopX11 needs X11 connection to be
   // initialized.
   gfx::InitializeThreadedX11();
   return new UIControlsDesktopX11();
 }
 
 }  // namespace test
 }  // namespace views