Only call to ImeDriver on ChromeOS

It's only needed when we have the UI service, which for now is only on ChromeOS.

BUG=846127
TEST=none

Change-Id: I31980540ac15a63657cb1043b59c4ad6f2f03a0e
Reviewed-on: https://chromium-review.googlesource.com/1072029Reviewed-by: James Cook <jamescook@chromium.org>
Commit-Queue: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#561634}

chrome/browser/ui/ash/chrome_browser_main_extra_parts_ash.cc

@@ -41,6 +41,7 @@
 #include "chrome/browser/ui/ash/wallpaper_controller_client.h"
 #include "chrome/browser/ui/views/frame/immersive_context_mus.h"
 #include "chrome/browser/ui/views/frame/immersive_handler_factory_mus.h"
+#include "chrome/browser/ui/views/ime_driver/ime_driver_mus.h"
 #include "chrome/browser/ui/views/select_file_dialog_extension.h"
 #include "chrome/browser/ui/views/select_file_dialog_extension_factory.h"
 #include "chromeos/network/network_connect.h"
@@ -148,6 +149,9 @@ void ChromeBrowserMainExtraPartsAsh::ServiceManagerConnectionStarted(
 }
 
 void ChromeBrowserMainExtraPartsAsh::PreProfileInit() {
+  // IME driver must be available at login screen, so initialize before profile.
+  IMEDriver::Register();
+
   // NetworkConnect handles the network connection state machine for the UI.
   network_connect_delegate_ =
       std::make_unique<NetworkConnectDelegateChromeOS>();

chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc

@@ -11,7 +11,6 @@
 #include "chrome/browser/ui/views/chrome_constrained_window_views_client.h"
 #include "chrome/browser/ui/views/chrome_views_delegate.h"
 #include "chrome/browser/ui/views/harmony/chrome_layout_provider.h"
-#include "chrome/browser/ui/views/ime_driver/ime_driver_mus.h"
 #include "components/constrained_window/constrained_window_views.h"
 #include "services/service_manager/sandbox/switches.h"
 
@@ -94,9 +93,6 @@ void ChromeBrowserMainExtraPartsViews::PreCreateThreads() {
 
 void ChromeBrowserMainExtraPartsViews::PreProfileInit() {
 #if defined(USE_AURA)
-  // IME driver must be available at login screen, so initialize before profile.
-  IMEDriver::Register();
-
   // Start devtools server
   network::mojom::NetworkContext* network_context =
       g_browser_process->system_network_context_manager()->GetContext();