Use injection and remove ozone dependency from ui/display

ui/display/chromeos/display_configurator.h

Index: ui/display/chromeos/display_configurator.h
diff --git a/ui/display/chromeos/display_configurator.h b/ui/display/chromeos/display_configurator.h
index 7a2449f3e56de61715d54f490333e072d18fe8d6..e1d697fc9ca94403bfa43ea130716a2ed8015ec7 100644
--- a/ui/display/chromeos/display_configurator.h
+++ b/ui/display/chromeos/display_configurator.h
@@ -201,7 +201,8 @@ class DISPLAY_EXPORT DisplayConfigurator : public NativeDisplayObserver {
 
   // Initialization, must be called right after constructor.
   // |is_panel_fitting_enabled| indicates hardware panel fitting support.
-  void Init(bool is_panel_fitting_enabled);
+  void Init(scoped_ptr<NativeDisplayDelegate> delegate,
+            bool is_panel_fitting_enabled);
 
   // Does initial configuration of displays during startup.
   // If |background_color_argb| is non zero and there are multiple displays,
@@ -299,9 +300,6 @@ class DISPLAY_EXPORT DisplayConfigurator : public NativeDisplayObserver {
   typedef std::map<ContentProtectionClientId, ContentProtections>
       ProtectionRequests;
 
-  // Performs platform specific delegate initialization.
-  scoped_ptr<NativeDisplayDelegate> CreatePlatformNativeDisplayDelegate();
-
   // Configures displays. Invoked by |configure_timer_|.
   void ConfigureDisplays();