Make browser process a singleton service

chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h"
 
 #include "base/memory/ptr_util.h"
 #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/ime_driver/ime_driver_mus.h"
@@ skipping 84 matching lines @@
 
   exit(EXIT_FAILURE);
 #endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
 }
 
 void ChromeBrowserMainExtraPartsViews::ServiceManagerConnectionStarted(
     content::ServiceManagerConnection* connection) {
   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);
     input_device_client_->Connect(std::move(server));
 
     // 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);
   }
 #endif  // defined(USE_AURA)
 }