[dbus] Move upstart client to from browser to common clients

ash/detachable_base_handler/ now depends on upstart client to
(re)start detachable base pairing status checks on start up, so the
client should be available to ash.

BUG=818057
TEST=No crash when starting Chrome with --enable-features=Mash

Change-Id: Id2e89b9c0f2fca0e850a05ac20d9d14c616e7923
Reviewed-on: https://chromium-review.googlesource.com/963297Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
Commit-Queue: Toni Barzic <tbarzic@chromium.org>
Cr-Commit-Position: refs/heads/master@{#543216}

chromeos/dbus/dbus_clients_browser.cc

@@ -25,14 +25,12 @@
 #include "chromeos/dbus/fake_lorgnette_manager_client.h"
 #include "chromeos/dbus/fake_media_analytics_client.h"
 #include "chromeos/dbus/fake_smb_provider_client.h"
-#include "chromeos/dbus/fake_upstart_client.h"
 #include "chromeos/dbus/fake_virtual_file_provider_client.h"
 #include "chromeos/dbus/image_burner_client.h"
 #include "chromeos/dbus/image_loader_client.h"
 #include "chromeos/dbus/lorgnette_manager_client.h"
 #include "chromeos/dbus/media_analytics_client.h"
 #include "chromeos/dbus/smb_provider_client.h"
-#include "chromeos/dbus/upstart_client.h"
 #include "chromeos/dbus/virtual_file_provider_client.h"
 
 namespace chromeos {
@@ -97,11 +95,6 @@ DBusClientsBrowser::DBusClientsBrowser(bool use_real_clients) {
   else
     smb_provider_client_ = std::make_unique<FakeSmbProviderClient>();
 
-  if (use_real_clients)
-    upstart_client_.reset(UpstartClient::Create());
-  else
-    upstart_client_.reset(new FakeUpstartClient);
-
   if (use_real_clients)
     virtual_file_provider_client_.reset(VirtualFileProviderClient::Create());
   else
@@ -125,7 +118,6 @@ void DBusClientsBrowser::Initialize(dbus::Bus* system_bus) {
   lorgnette_manager_client_->Init(system_bus);
   media_analytics_client_->Init(system_bus);
   smb_provider_client_->Init(system_bus);
-  upstart_client_->Init(system_bus);
   virtual_file_provider_client_->Init(system_bus);
 }
 

chromeos/dbus/dbus_clients_browser.h

@@ -28,7 +28,6 @@ class ImageLoaderClient;
 class LorgnetteManagerClient;
 class MediaAnalyticsClient;
 class SmbProviderClient;
-class UpstartClient;
 class VirtualFileProviderClient;
 
 // D-Bus clients used only in the browser process.
@@ -58,7 +57,6 @@ class CHROMEOS_EXPORT DBusClientsBrowser {
   std::unique_ptr<LorgnetteManagerClient> lorgnette_manager_client_;
   std::unique_ptr<MediaAnalyticsClient> media_analytics_client_;
   std::unique_ptr<SmbProviderClient> smb_provider_client_;
-  std::unique_ptr<UpstartClient> upstart_client_;
   std::unique_ptr<VirtualFileProviderClient> virtual_file_provider_client_;
 
   DISALLOW_COPY_AND_ASSIGN(DBusClientsBrowser);

chromeos/dbus/dbus_clients_common.cc

@@ -25,6 +25,7 @@
 #include "chromeos/dbus/fake_shill_third_party_vpn_driver_client.h"
 #include "chromeos/dbus/fake_sms_client.h"
 #include "chromeos/dbus/fake_system_clock_client.h"
+#include "chromeos/dbus/fake_upstart_client.h"
 #include "chromeos/dbus/gsm_sms_client.h"
 #include "chromeos/dbus/hammerd_client.h"
 #include "chromeos/dbus/modem_messaging_client.h"
@@ -41,6 +42,7 @@
 #include "chromeos/dbus/sms_client.h"
 #include "chromeos/dbus/system_clock_client.h"
 #include "chromeos/dbus/update_engine_client.h"
+#include "chromeos/dbus/upstart_client.h"
 
 namespace chromeos {
 
@@ -120,6 +122,11 @@ DBusClientsCommon::DBusClientsCommon(bool use_real_clients) {
     system_clock_client_.reset(new FakeSystemClockClient);
 
   update_engine_client_.reset(UpdateEngineClient::Create(client_impl_type));
+
+  if (use_real_clients)
+    upstart_client_.reset(UpstartClient::Create());
+  else
+    upstart_client_.reset(new FakeUpstartClient);
 }
 
 DBusClientsCommon::~DBusClientsCommon() = default;
@@ -145,6 +152,7 @@ void DBusClientsCommon::Initialize(dbus::Bus* system_bus) {
   sms_client_->Init(system_bus);
   system_clock_client_->Init(system_bus);
   update_engine_client_->Init(system_bus);
+  upstart_client_->Init(system_bus);
 
   ShillManagerClient::TestInterface* manager =
       shill_manager_client_->GetTestInterface();

chromeos/dbus/dbus_clients_common.h

@@ -34,6 +34,7 @@ class ShillThirdPartyVpnDriverClient;
 class SMSClient;
 class SystemClockClient;
 class UpdateEngineClient;
+class UpstartClient;
 
 // D-Bus clients used in multiple processes (e.g. ash, browser, mus).
 class CHROMEOS_EXPORT DBusClientsCommon {
@@ -69,6 +70,7 @@ class CHROMEOS_EXPORT DBusClientsCommon {
   std::unique_ptr<PowerManagerClient> power_manager_client_;
   std::unique_ptr<SessionManagerClient> session_manager_client_;
   std::unique_ptr<UpdateEngineClient> update_engine_client_;
+  std::unique_ptr<UpstartClient> upstart_client_;
 
   DISALLOW_COPY_AND_ASSIGN(DBusClientsCommon);
 };

chromeos/dbus/dbus_thread_manager.cc

@@ -247,7 +247,7 @@ UpdateEngineClient* DBusThreadManager::GetUpdateEngineClient() {
 }
 
 UpstartClient* DBusThreadManager::GetUpstartClient() {
-  return clients_browser_ ? clients_browser_->upstart_client_.get() : nullptr;
+  return clients_common_ ? clients_common_->upstart_client_.get() : nullptr;
 }
 
 VirtualFileProviderClient* DBusThreadManager::GetVirtualFileProviderClient() {
@@ -471,7 +471,7 @@ void DBusThreadManagerSetter::SetUpdateEngineClient(
 
 void DBusThreadManagerSetter::SetUpstartClient(
     std::unique_ptr<UpstartClient> client) {
-  DBusThreadManager::Get()->clients_browser_->upstart_client_ =
+  DBusThreadManager::Get()->clients_common_->upstart_client_ =
       std::move(client);
 }