Moving input device hotplug event processing outside of ui/display

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..96853d81c82668a0e63081455c7392a9593b3f6c 100644
--- a/ui/display/chromeos/display_configurator.cc
+++ b/ui/display/chromeos/display_configurator.cc
@@ -91,7 +91,6 @@ int GetDisplayPower(
 
 DisplayConfigurator::DisplayState::DisplayState()
     : display(NULL),
-      touch_device_id(0),
       selected_mode(NULL),
       mirror_mode(NULL) {}
 
@@ -159,12 +158,10 @@ DisplayConfigurator::~DisplayConfigurator() {
 }
 
 void DisplayConfigurator::SetDelegatesForTesting(
-    scoped_ptr<NativeDisplayDelegate> display_delegate,
-    scoped_ptr<TouchscreenDelegate> touchscreen_delegate) {
+    scoped_ptr<NativeDisplayDelegate> display_delegate) {
   DCHECK(!native_display_delegate_);
-  DCHECK(!touchscreen_delegate_);
 
-  InitializeDelegates(display_delegate.Pass(), touchscreen_delegate.Pass());
+  InitializeDelegates(display_delegate.Pass());
   configure_display_ = true;
 }
 
@@ -183,12 +180,9 @@ void DisplayConfigurator::Init(bool is_panel_fitting_enabled) {
 }
 
 void DisplayConfigurator::InitializeDelegates(
-    scoped_ptr<NativeDisplayDelegate> display_delegate,
-    scoped_ptr<TouchscreenDelegate> touchscreen_delegate) {
-  if (!native_display_delegate_ && !touchscreen_delegate_) {
+    scoped_ptr<NativeDisplayDelegate> display_delegate) {
+  if (!native_display_delegate_) {
     native_display_delegate_ = display_delegate.Pass();
-    touchscreen_delegate_ = touchscreen_delegate.Pass();
-
     native_display_delegate_->AddObserver(this);
   }
 }
@@ -555,8 +549,6 @@ void DisplayConfigurator::UpdateCachedDisplays() {
     cached_displays_.push_back(display_state);
   }
 
-  touchscreen_delegate_->AssociateTouchscreens(&cached_displays_);
-
   // Set |selected_mode| fields.
   for (size_t i = 0; i < cached_displays_.size(); ++i) {
     DisplayState* display_state = &cached_displays_[i];