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

For Ozone, there is no default platform. Since the unittests use their own
delegates this simplifies things by not requiring an Ozone platform when
executing the unittests.

BUG=none

Review URL: https://codereview.chromium.org/383463002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282188 0039d316-1c4b-4281-b951-d872f2087c98

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(

ui/display/chromeos/display_configurator.h

@@ -255,14 +255,9 @@ class DISPLAY_EXPORT DisplayConfigurator : public NativeDisplayObserver {
   typedef std::map<ContentProtectionClientId, ContentProtections>
       ProtectionRequests;
 
-  // If |native_display_delegate_| and |touchscreen_delegate_| are not set, then
-  // set them to the passed in values.
-  void InitializeDelegates(
-      scoped_ptr<NativeDisplayDelegate> display_delegate,
-      scoped_ptr<TouchscreenDelegate> touchscreen_delegate);
-
   // Performs platform specific delegate initialization.
-  void PlatformInitialize();
+  scoped_ptr<NativeDisplayDelegate> CreatePlatformNativeDisplayDelegate();
+  scoped_ptr<TouchscreenDelegate> CreatePlatformTouchscreenDelegate();
 
   // Updates |cached_displays_| to contain currently-connected displays. Calls
   // |delegate_->GetDisplays()| and then does additional work, like finding the

ui/display/chromeos/ozone/display_configurator_ozone.cc

@@ -11,11 +11,15 @@
 
 namespace ui {
 
-void DisplayConfigurator::PlatformInitialize() {
-  InitializeDelegates(
-      ui::OzonePlatform::GetInstance()->CreateNativeDisplayDelegate(),
-      scoped_ptr<TouchscreenDelegate>(new TouchscreenDelegateImpl(
-          ui::OzonePlatform::GetInstance()->CreateTouchscreenDeviceManager())));
+scoped_ptr<NativeDisplayDelegate>
+DisplayConfigurator::CreatePlatformNativeDisplayDelegate() {
+  return ui::OzonePlatform::GetInstance()->CreateNativeDisplayDelegate();
+}
+
+scoped_ptr<DisplayConfigurator::TouchscreenDelegate>
+DisplayConfigurator::CreatePlatformTouchscreenDelegate() {
+  return scoped_ptr<TouchscreenDelegate>(new TouchscreenDelegateImpl(
+      ui::OzonePlatform::GetInstance()->CreateTouchscreenDeviceManager()));
 }
 
 }  // namespace ui

ui/display/chromeos/x11/display_configurator_x11.cc

@@ -10,12 +10,16 @@
 
 namespace ui {
 
-void DisplayConfigurator::PlatformInitialize() {
-  InitializeDelegates(
-      scoped_ptr<NativeDisplayDelegate>(new NativeDisplayDelegateX11()),
-      scoped_ptr<TouchscreenDelegate>(new TouchscreenDelegateImpl(
-          scoped_ptr<TouchscreenDeviceManager>(
-              new TouchscreenDeviceManagerX11()))));
+scoped_ptr<NativeDisplayDelegate>
+DisplayConfigurator::CreatePlatformNativeDisplayDelegate() {
+  return scoped_ptr<NativeDisplayDelegate>(new NativeDisplayDelegateX11());
+}
+
+scoped_ptr<DisplayConfigurator::TouchscreenDelegate>
+DisplayConfigurator::CreatePlatformTouchscreenDelegate() {
+  return scoped_ptr<TouchscreenDelegate>(new TouchscreenDelegateImpl(
+      scoped_ptr<TouchscreenDeviceManager>(
+          new TouchscreenDeviceManagerX11())));
 }
 
 }  // namespace ui