Fix namespace for src/ui/display/.

media/gpu/rendering_helper.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 "media/gpu/rendering_helper.h"
 
 #include <string.h>
 
 #include <algorithm>
 #include <memory>
@@ skipping 68 matching lines @@
 namespace {
 
 void WaitForSwapAck(const base::Closure& callback, gfx::SwapResult result) {
   callback.Run();
 }
 
 }  // namespace
 
 #if defined(USE_OZONE)
 
-class DisplayConfiguratorObserver : public ui::DisplayConfigurator::Observer {
+class DisplayConfiguratorObserver
+    : public display::DisplayConfigurator::Observer {
  public:
   explicit DisplayConfiguratorObserver(base::RunLoop* loop) : loop_(loop) {}
   ~DisplayConfiguratorObserver() override {}
 
  private:
-  // ui::DisplayConfigurator::Observer overrides:
+  // display::DisplayConfigurator::Observer overrides:
   void OnDisplayModeChanged(
-      const ui::DisplayConfigurator::DisplayStateList& outputs) override {
+      const display::DisplayConfigurator::DisplayStateList& outputs) override {
     if (!loop_)
       return;
     loop_->Quit();
     loop_ = nullptr;
   }
   void OnDisplayModeChangeFailed(
-      const ui::DisplayConfigurator::DisplayStateList& outputs,
-      ui::MultipleDisplayState failed_new_state) override {
+      const display::DisplayConfigurator::DisplayStateList& outputs,
+      display::MultipleDisplayState failed_new_state) override {
     LOG(FATAL) << "Could not configure display";
   }
 
   base::RunLoop* loop_;
 
   DISALLOW_COPY_AND_ASSIGN(DisplayConfiguratorObserver);
 };
 
 class RenderingHelper::StubOzoneDelegate : public ui::PlatformWindowDelegate {
  public:
@@ skipping 134 matching lines @@
   gfx::Size window_size(800, 600);
   // Ignore the vsync provider by default. On ChromeOS this will be set
   // accordingly based on the display configuration.
   ignore_vsync_ = true;
 #if defined(OS_CHROMEOS)
   // We hold onto the main loop here to wait for the DisplayController
   // to give us the size of the display so we can create a window of
   // the same size.
   base::RunLoop wait_display_setup;
   DisplayConfiguratorObserver display_setup_observer(&wait_display_setup);
-  display_configurator_.reset(new ui::DisplayConfigurator());
+  display_configurator_.reset(new display::DisplayConfigurator());
   display_configurator_->SetDelegateForTesting(0);
   display_configurator_->AddObserver(&display_setup_observer);
   display_configurator_->Init(
       ui::OzonePlatform::GetInstance()->CreateNativeDisplayDelegate(), true);
   display_configurator_->ForceInitialConfigure(0);
   // Make sure all the display configuration is applied.
   wait_display_setup.Run();
   display_configurator_->RemoveObserver(&display_setup_observer);
 
   gfx::Size framebuffer_size = display_configurator_->framebuffer_size();
@@ skipping 617 matching lines @@
   // When the rendering falls behind, drops frames.
   while (scheduled_render_time_ < target) {
     scheduled_render_time_ += frame_duration_;
     DropOneFrameForAllVideos();
   }
 
   task_runner_->PostDelayedTask(FROM_HERE, render_task_.callback(),
                                 target - now);
 }
 }  // namespace media