Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(591)

Unified Diff: chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Issue 2400163003: arc: enable Android tracing in verified-boot mode (Closed)
Patch Set: add FakeArcTraceAgent for linux and test Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index 4b3e12bfb9ce489d6a0d4c315c4bd49d8ae48382..be6cbe1d01c1f9fc2591cab5646c639f74de73a4 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -35,6 +35,7 @@
#include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
#include "chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification.h"
#include "chrome/browser/chromeos/arc/arc_service_launcher.h"
+#include "chrome/browser/chromeos/arc/trace/arc_trace_bridge.h"
#include "chrome/browser/chromeos/boot_times_recorder.h"
#include "chrome/browser/chromeos/dbus/chrome_console_service_provider_delegate.h"
#include "chrome/browser/chromeos/dbus/chrome_display_power_service_provider_delegate.h"
@@ -109,6 +110,7 @@
#include "chromeos/cryptohome/cryptohome_parameters.h"
#include "chromeos/cryptohome/homedir_methods.h"
#include "chromeos/cryptohome/system_salt_getter.h"
+#include "chromeos/dbus/arc_trace_agent.h"
#include "chromeos/dbus/dbus_thread_manager.h"
#include "chromeos/dbus/power_policy_controller.h"
#include "chromeos/dbus/services/console_service_provider.h"
@@ -429,6 +431,9 @@ void ChromeBrowserMainPartsChromeos::PreMainMessageLoopRun() {
arc_service_launcher_.reset(new arc::ArcServiceLauncher());
arc_service_launcher_->Initialize();
+ DBusThreadManager::Get()->GetArcTraceAgent()->SetDelegate(
+ arc::ArcTraceBridge::Get());
+
chromeos::ResourceReporter::GetInstance()->StartMonitoring(
task_manager::TaskManagerInterface::GetTaskManager());

Powered by Google App Engine
This is Rietveld 408576698