Revert of Fix breaking change in It2me Host on Ozone

remoting/host/input_injector_chromeos.cc

Index: remoting/host/input_injector_chromeos.cc
diff --git a/remoting/host/input_injector_chromeos.cc b/remoting/host/input_injector_chromeos.cc
index 04722ffcb5506a95bf8951043d6a8c29dbe71584..c58110a7f9ff51eda6786317dff4126e690a721b 100644
--- a/remoting/host/input_injector_chromeos.cc
+++ b/remoting/host/input_injector_chromeos.cc
@@ -74,7 +74,13 @@
   DISALLOW_COPY_AND_ASSIGN(Core);
 };
 
-InputInjectorChromeos::Core::Core() : saved_auto_repeat_enabled_(false) {
+InputInjectorChromeos::Core::Core(scoped_ptr<ui::SystemInputInjector> delegate,
+                                  ui::InputController* input_controller)
+    : delegate_(delegate.Pass()),
+      input_controller_(input_controller),
+      saved_auto_repeat_enabled_(false) {
+  DCHECK(delegate_);
+  DCHECK(input_controller_);
 }
 
 void InputInjectorChromeos::Core::InjectClipboardEvent(
@@ -150,13 +156,6 @@
 
 void InputInjectorChromeos::Core::Start(
     scoped_ptr<protocol::ClipboardStub> client_clipboard) {
-  ui::OzonePlatform* ozone_platform = ui::OzonePlatform::GetInstance();
-  delegate_ = ozone_platform->CreateSystemInputInjector();
-  DCHECK(delegate_);
-  input_controller_ = ozone_platform->GetInputController();
-  DCHECK(input_controller_);
-
-  // Implemented by remoting::ClipboardAura.
   clipboard_ = Clipboard::Create();
   clipboard_->Start(client_clipboard.Pass());
   point_transformer_.reset(new PointTransformer());
@@ -165,7 +164,9 @@
 InputInjectorChromeos::InputInjectorChromeos(
     scoped_refptr<base::SingleThreadTaskRunner> task_runner)
     : input_task_runner_(task_runner) {
-  core_.reset(new Core());
+  ui::OzonePlatform* ozone_platform = ui::OzonePlatform::GetInstance();
+  core_.reset(new Core(ozone_platform->CreateSystemInputInjector(),
+                       ozone_platform->GetInputController()));
 }
 
 InputInjectorChromeos::~InputInjectorChromeos() {