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

ui/display/chromeos/display_configurator.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/display/chromeos/display_configurator.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 146 matching lines @@
   if (native_display_delegate_)
     native_display_delegate_->RemoveObserver(this);
 }
 
 void DisplayConfigurator::SetDelegatesForTesting(
     scoped_ptr<NativeDisplayDelegate> display_delegate,
     scoped_ptr<TouchscreenDelegate> touchscreen_delegate) {
   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;
 }
 
 void DisplayConfigurator::SetInitialDisplayPower(
     chromeos::DisplayPowerState power_state) {
   DCHECK_EQ(display_state_, MULTIPLE_DISPLAY_STATE_INVALID);
   power_state_ = power_state;
 }
 
 void DisplayConfigurator::Init(bool is_panel_fitting_enabled) {
   is_panel_fitting_enabled_ = is_panel_fitting_enabled;
   if (!configure_display_)
     return;
 
-  PlatformInitialize();
-}
-
-void DisplayConfigurator::InitializeDelegates(
-    scoped_ptr<NativeDisplayDelegate> display_delegate,
-    scoped_ptr<TouchscreenDelegate> touchscreen_delegate) {
+  // If the delegates are already initialized don't update them (For example,
+  // tests set their own delegates).
   if (!native_display_delegate_ && !touchscreen_delegate_) {
-    native_display_delegate_ = display_delegate.Pass();
-    touchscreen_delegate_ = touchscreen_delegate.Pass();
+    native_display_delegate_ = CreatePlatformNativeDisplayDelegate();

[Daniel Erat, 2014/07/09 21:17:23]

nit: probably safer to do this now:

  if (!native...)
    native... = ...;
  if (!touchscreen...)
    touchscreen... = ....;

[dnicoara, 2014/07/09 21:21:50]

Done.

+    touchscreen_delegate_ = CreatePlatformTouchscreenDelegate();
 
     native_display_delegate_->AddObserver(this);
   }
 }
 
 void DisplayConfigurator::ForceInitialConfigure(
     uint32_t background_color_argb) {
   if (!configure_display_)
     return;
 
@@ skipping 732 matching lines @@
         return state_controller_->GetStateForDisplayIds(display_ids);
       }
     }
     default:
       NOTREACHED();
   }
   return MULTIPLE_DISPLAY_STATE_INVALID;
 }
 
 }  // namespace ui