arc: enable Android tracing in verified-boot mode

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/logging.h"
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/chromeos/arc/arc_auth_service.h"
 #include "chrome/browser/chromeos/arc/arc_session_manager.h"
 #include "chrome/browser/chromeos/arc/downloads_watcher/arc_downloads_watcher_service.h"
 #include "chrome/browser/chromeos/arc/enterprise/arc_enterprise_reporting_service.h"
 #include "chrome/browser/chromeos/arc/fileapi/arc_content_file_system_service.h"
 #include "chrome/browser/chromeos/arc/intent_helper/arc_settings_service.h"
 #include "chrome/browser/chromeos/arc/notification/arc_boot_error_notification.h"
 #include "chrome/browser/chromeos/arc/policy/arc_policy_bridge.h"
 #include "chrome/browser/chromeos/arc/print/arc_print_service.h"
 #include "chrome/browser/chromeos/arc/process/arc_process_service.h"
+#include "chrome/browser/chromeos/arc/trace/arc_trace_bridge.h"
 #include "chrome/browser/chromeos/arc/tts/arc_tts_service.h"
 #include "chrome/browser/chromeos/arc/video/gpu_arc_video_service_host.h"
 #include "chrome/browser/chromeos/arc/wallpaper/arc_wallpaper_service.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
 #include "components/arc/arc_service_manager.h"
 #include "components/arc/audio/arc_audio_bridge.h"
 #include "components/arc/bluetooth/arc_bluetooth_bridge.h"
 #include "components/arc/boot_phase_monitor/arc_boot_phase_monitor_bridge.h"
 #include "components/arc/clipboard/arc_clipboard_bridge.h"
 #include "components/arc/crash_collector/arc_crash_collector_bridge.h"
@@ skipping 90 matching lines @@
   arc_service_manager_->AddService(
       base::MakeUnique<ArcPowerBridge>(arc_bridge_service));
   arc_service_manager_->AddService(
       base::MakeUnique<ArcPrintService>(arc_bridge_service));
   arc_service_manager_->AddService(
       base::MakeUnique<ArcProcessService>(arc_bridge_service));
   arc_service_manager_->AddService(
       base::MakeUnique<ArcSettingsService>(arc_bridge_service));
   arc_service_manager_->AddService(
       base::MakeUnique<ArcStorageManager>(arc_bridge_service));
   arc_service_manager_->AddService(

[Yusuke Sato, 2017/01/04 23:55:47]

Can you instead do something like this?

 auto trace = base::MakeUnique<ArcTraceBridge>(arc_bridge_service));
 DBusThreadManager::Get()->GetArcTraceAgent()->SetDelegate(trace.get());
 arc_service_manager_->AddService(std::move(trace));

[Earl Ou, 2017/01/16 14:05:39]

I move this to the ctor of ArcTraceBridge

+      base::MakeUnique<ArcTraceBridge>(arc_bridge_service));
+  arc_service_manager_->AddService(
       base::MakeUnique<ArcTtsService>(arc_bridge_service));
   arc_service_manager_->AddService(
       base::MakeUnique<ArcWallpaperService>(arc_bridge_service));
   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_session_manager_->OnPrimaryUserProfilePrepared(profile);
 }
 
 void ArcServiceLauncher::Shutdown() {
   DCHECK(arc_service_manager_);
   // Destroy in the reverse order of the initialization.

[Yusuke Sato, 2017/01/04 23:55:47]

..and DBusThreadManager::Get()->GetArcTraceAgent()->SetDelegate(nullptr); here.

[Earl Ou, 2017/01/16 14:05:39]

Moved to the dtor of ArcTraceBridge

   arc_service_manager_->Shutdown();
   arc_session_manager_.reset();
   arc_service_manager_.reset();
 }
 
 }  // namespace arc