arc: Add cryptohome_id to EmitArcBooted.

chrome/browser/chromeos/arc/arc_service_launcher.cc

 // Copyright 2016 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/chromeos/arc/arc_service_launcher.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 81 matching lines @@
       base::MakeUnique<ArcAccessibilityHelperBridge>(arc_bridge_service));
   arc_service_manager_->AddService(
       base::MakeUnique<ArcAudioBridge>(arc_bridge_service));
   arc_service_manager_->AddService(
       base::MakeUnique<ArcAuthService>(arc_bridge_service));
   arc_service_manager_->AddService(
       base::MakeUnique<ArcBluetoothBridge>(arc_bridge_service));
   arc_service_manager_->AddService(
       base::MakeUnique<ArcBootErrorNotification>(arc_bridge_service));
   arc_service_manager_->AddService(
-      base::MakeUnique<ArcBootPhaseMonitorBridge>(arc_bridge_service));
-  arc_service_manager_->AddService(
       base::MakeUnique<ArcClipboardBridge>(arc_bridge_service));
   arc_service_manager_->AddService(base::MakeUnique<ArcCrashCollectorBridge>(
       arc_bridge_service, arc_service_manager_->blocking_task_runner()));
   arc_service_manager_->AddService(
       base::MakeUnique<ArcFileSystemOperationRunner>(arc_bridge_service));
   arc_service_manager_->AddService(
       base::MakeUnique<ArcDownloadsWatcherService>(arc_bridge_service));
   arc_service_manager_->AddService(
       base::MakeUnique<ArcEnterpriseReportingService>(arc_bridge_service));
   arc_service_manager_->AddService(
@@ skipping 27 matching lines @@
   arc_service_manager_->AddService(
       base::MakeUnique<GpuArcVideoServiceHost>(arc_bridge_service));
 }
 
 void ArcServiceLauncher::OnPrimaryUserProfilePrepared(Profile* profile) {
   DCHECK(arc_service_manager_);
   arc_service_manager_->AddService(base::MakeUnique<ArcNotificationManager>(
       arc_service_manager_->arc_bridge_service(),
       multi_user_util::GetAccountIdFromProfile(profile)));
 
+  arc_service_manager_->AddService(base::MakeUnique<ArcBootPhaseMonitorBridge>(

[Luis Héctor Chávez, 2017/02/15 19:02:11]

nit: add "// List in lexicographical order" in L145, remove the blank line in
L148 and sort.

[xzhou, 2017/02/16 18:34:49]

Done.

+      arc_service_manager_->arc_bridge_service(), profile));
+
   // Kiosk apps should be run only for kiosk sessions.
   if (user_manager::UserManager::Get()->IsLoggedInAsArcKioskApp()) {
     // ArcKioskAppService is BrowserContextKeyedService so that it's destroyed
     // on destroying the Profile, that is after ArcServiceLauncher::Shutdown().
     arc_service_manager_->AddService(base::MakeUnique<ArcKioskBridge>(
         arc_service_manager_->arc_bridge_service(),
         chromeos::ArcKioskAppService::Get(profile)));
   }
 
   arc_session_manager_->OnPrimaryUserProfilePrepared(profile);
 }
 
 void ArcServiceLauncher::Shutdown() {
   DCHECK(arc_service_manager_);
   // Destroy in the reverse order of the initialization.
   arc_service_manager_->Shutdown();
   arc_session_manager_.reset();
   arc_service_manager_.reset();
 }
 
 }  // namespace arc