Make browser process a singleton service

chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc

Index: chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc
diff --git a/chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc b/chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc
index 38e4b616fb7bfd5d4bf80f656ea52ae44602f1e3..b7cc45a8b536650f06a1eaa3352356793256857f 100644
--- a/chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc
+++ b/chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc
@@ -102,12 +102,6 @@ void ChromeBrowserMainExtraPartsViews::ServiceManagerConnectionStarted(
   DCHECK(connection);
 #if defined(USE_AURA)
   if (service_manager::ServiceManagerIsRemote()) {
-    // TODO(rockot): Remove the blocking wait for init.
-    // http://crbug.com/594852.
-    base::RunLoop wait_loop;
-    connection->SetInitializeHandler(wait_loop.QuitClosure());
-    wait_loop.Run();
-
     input_device_client_.reset(new ui::InputDeviceClient());
     ui::mojom::InputDeviceServerPtr server;
     connection->GetConnector()->BindInterface(ui::mojom::kServiceName, &server);
@@ -116,7 +110,7 @@ void ChromeBrowserMainExtraPartsViews::ServiceManagerConnectionStarted(
     // WMState is owned as a member, so don't have MusClient create it.
     const bool create_wm_state = false;
     mus_client_ = base::MakeUnique<views::MusClient>(
-        connection->GetConnector(), connection->GetIdentity(),
+        connection->GetConnector(), service_manager::Identity(),
         content::BrowserThread::GetTaskRunnerForThread(
             content::BrowserThread::IO),
         create_wm_state);