ozone: Remove GetAcceleratedWidget from SurfaceFactoryOzone

ui/ozone/platform/dri/dri_window.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 "ui/ozone/platform/dri/dri_window.h"
 
 #include "ui/events/event.h"
 #include "ui/events/platform/platform_event_source.h"
+#include "ui/ozone/platform/dri/dri_surface_factory.h"
 #include "ui/ozone/public/cursor_factory_ozone.h"
 #include "ui/ozone/public/surface_factory_ozone.h"
 #include "ui/platform_window/platform_window_delegate.h"
 
 namespace ui {
 
 DriWindow::DriWindow(PlatformWindowDelegate* delegate,
-                     const gfx::Rect& bounds)
+                     const gfx::Rect& bounds,
+                     DriSurfaceFactory* surface_factory)
     : delegate_(delegate), bounds_(bounds) {
-  widget_ = SurfaceFactoryOzone::GetInstance()->GetAcceleratedWidget();
+  widget_ = surface_factory->GetAcceleratedWidget();
   delegate_->OnAcceleratedWidgetAvailable(widget_);
   PlatformEventSource::GetInstance()->AddPlatformEventDispatcher(this);
 }
 
 DriWindow::~DriWindow() {
   PlatformEventSource::GetInstance()->RemovePlatformEventDispatcher(this);
 }
 
 void DriWindow::Show() {}
 
@@ skipping 31 matching lines @@
   return true;
 }
 
 uint32_t DriWindow::DispatchEvent(const PlatformEvent& ne) {
   Event* event = static_cast<Event*>(ne);
   delegate_->DispatchEvent(event);
   return POST_DISPATCH_STOP_PROPAGATION;
 }
 
 }  // namespace ui