[2/4]Allow hotplugging of primary DRM device

ui/ozone/platform/drm/gpu/drm_window_unittest.cc

 // Copyright 2014 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 <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkImageInfo.h"
 #include "ui/ozone/platform/drm/drm_surface_factory.h"
 #include "ui/ozone/platform/drm/gpu/drm_buffer.h"
+#include "ui/ozone/platform/drm/gpu/drm_device_generator.h"
 #include "ui/ozone/platform/drm/gpu/drm_device_manager.h"
 #include "ui/ozone/platform/drm/gpu/drm_surface.h"
 #include "ui/ozone/platform/drm/gpu/drm_window.h"
 #include "ui/ozone/platform/drm/gpu/hardware_display_controller.h"
 #include "ui/ozone/platform/drm/gpu/screen_manager.h"
 #include "ui/ozone/platform/drm/test/mock_drm_device.h"
 #include "ui/ozone/public/surface_ozone_canvas.h"
 
 namespace {
 
@@ skipping 50 matching lines @@
 
 void DrmWindowTest::SetUp() {
   message_loop_.reset(new base::MessageLoopForUI);
   drm_ = new ui::MockDrmDevice();
   buffer_generator_.reset(new ui::DrmBufferGenerator());
   screen_manager_.reset(new ui::ScreenManager(buffer_generator_.get()));
   screen_manager_->AddDisplayController(drm_, kDefaultCrtc, kDefaultConnector);
   screen_manager_->ConfigureDisplayController(
       drm_, kDefaultCrtc, kDefaultConnector, gfx::Point(), kDefaultMode);
 
-  drm_device_manager_.reset(new ui::DrmDeviceManager(drm_));
+  drm_device_manager_.reset(new ui::DrmDeviceManager(nullptr));
 
   scoped_ptr<ui::DrmWindow> window_delegate(new ui::DrmWindow(
       kDefaultWidgetHandle, drm_device_manager_.get(), screen_manager_.get()));
   window_delegate->Initialize();
   window_delegate->OnBoundsChanged(
       gfx::Rect(gfx::Size(kDefaultMode.hdisplay, kDefaultMode.vdisplay)));
   screen_manager_->AddWindow(kDefaultWidgetHandle, window_delegate.Pass());
 }
 
 void DrmWindowTest::TearDown() {
@@ skipping 45 matching lines @@
   // Move window to the display on the new device.
   screen_manager_->GetWindow(kDefaultWidgetHandle)
       ->OnBoundsChanged(gfx::Rect(0, kDefaultMode.vdisplay,
                                   kDefaultMode.hdisplay,
                                   kDefaultMode.vdisplay));
 
   EXPECT_EQ(2u, GetCursorBuffers(drm).size());
   // Make sure the cursor is showing on the new display.
   EXPECT_NE(0u, drm->get_cursor_handle_for_crtc(kDefaultCrtc));
 }