Don't bother asking the platform for the delegates if they are already set

ui/display/chromeos/display_configurator.cc

Index: ui/display/chromeos/display_configurator.cc
diff --git a/ui/display/chromeos/display_configurator.cc b/ui/display/chromeos/display_configurator.cc
index cfebc8df35f114504d1935f9104fb7482e4cf92a..2ee6e16e68346b51e16812002c696b6a598db5c3 100644
--- a/ui/display/chromeos/display_configurator.cc
+++ b/ui/display/chromeos/display_configurator.cc
@@ -164,7 +164,8 @@ void DisplayConfigurator::SetDelegatesForTesting(
   DCHECK(!native_display_delegate_);
   DCHECK(!touchscreen_delegate_);
 
-  InitializeDelegates(display_delegate.Pass(), touchscreen_delegate.Pass());
+  native_display_delegate_ = display_delegate.Pass();
+  touchscreen_delegate_ = touchscreen_delegate.Pass();
   configure_display_ = true;
 }
 
@@ -179,18 +180,15 @@ void DisplayConfigurator::Init(bool is_panel_fitting_enabled) {
   if (!configure_display_)
     return;
 
-  PlatformInitialize();
-}
-
-void DisplayConfigurator::InitializeDelegates(
-    scoped_ptr<NativeDisplayDelegate> display_delegate,
-    scoped_ptr<TouchscreenDelegate> touchscreen_delegate) {
-  if (!native_display_delegate_ && !touchscreen_delegate_) {
-    native_display_delegate_ = display_delegate.Pass();
-    touchscreen_delegate_ = touchscreen_delegate.Pass();
-
+  // If the delegates are already initialized don't update them (For example,
+  // tests set their own delegates).
+  if (!native_display_delegate_) {
+    native_display_delegate_ = CreatePlatformNativeDisplayDelegate();
     native_display_delegate_->AddObserver(this);
   }
+
+  if (!touchscreen_delegate_)
+    touchscreen_delegate_ = CreatePlatformTouchscreenDelegate();
 }
 
 void DisplayConfigurator::ForceInitialConfigure(