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

Side by Side Diff: chromeos/dbus/dbus_clients_browser.cc

Issue 2400163003: arc: enable Android tracing in verified-boot mode (Closed)
Patch Set: Fix according to review comments Created 3 years, 12 months 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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chromeos/dbus/dbus_clients_browser.h" 5 #include "chromeos/dbus/dbus_clients_browser.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "chromeos/dbus/arc_obb_mounter_client.h" 8 #include "chromeos/dbus/arc_obb_mounter_client.h"
9 #include "chromeos/dbus/arc_trace_agent.h"
9 #include "chromeos/dbus/auth_policy_client.h" 10 #include "chromeos/dbus/auth_policy_client.h"
10 #include "chromeos/dbus/cros_disks_client.h" 11 #include "chromeos/dbus/cros_disks_client.h"
11 #include "chromeos/dbus/dbus_client_implementation_type.h" 12 #include "chromeos/dbus/dbus_client_implementation_type.h"
12 #include "chromeos/dbus/dbus_thread_manager.h" 13 #include "chromeos/dbus/dbus_thread_manager.h"
13 #include "chromeos/dbus/debug_daemon_client.h" 14 #include "chromeos/dbus/debug_daemon_client.h"
14 #include "chromeos/dbus/easy_unlock_client.h" 15 #include "chromeos/dbus/easy_unlock_client.h"
15 #include "chromeos/dbus/fake_arc_obb_mounter_client.h" 16 #include "chromeos/dbus/fake_arc_obb_mounter_client.h"
16 #include "chromeos/dbus/fake_auth_policy_client.h" 17 #include "chromeos/dbus/fake_auth_policy_client.h"
17 #include "chromeos/dbus/fake_debug_daemon_client.h" 18 #include "chromeos/dbus/fake_debug_daemon_client.h"
18 #include "chromeos/dbus/fake_easy_unlock_client.h" 19 #include "chromeos/dbus/fake_easy_unlock_client.h"
19 #include "chromeos/dbus/fake_image_burner_client.h" 20 #include "chromeos/dbus/fake_image_burner_client.h"
20 #include "chromeos/dbus/fake_image_loader_client.h" 21 #include "chromeos/dbus/fake_image_loader_client.h"
21 #include "chromeos/dbus/fake_lorgnette_manager_client.h" 22 #include "chromeos/dbus/fake_lorgnette_manager_client.h"
22 #include "chromeos/dbus/fake_upstart_client.h" 23 #include "chromeos/dbus/fake_upstart_client.h"
23 #include "chromeos/dbus/image_burner_client.h" 24 #include "chromeos/dbus/image_burner_client.h"
24 #include "chromeos/dbus/image_loader_client.h" 25 #include "chromeos/dbus/image_loader_client.h"
25 #include "chromeos/dbus/lorgnette_manager_client.h" 26 #include "chromeos/dbus/lorgnette_manager_client.h"
26 #include "chromeos/dbus/upstart_client.h" 27 #include "chromeos/dbus/upstart_client.h"
27 28
28 namespace chromeos { 29 namespace chromeos {
29 30
30 DBusClientsBrowser::DBusClientsBrowser(bool use_real_clients) { 31 DBusClientsBrowser::DBusClientsBrowser(bool use_real_clients) {
31 if (use_real_clients) 32 if (use_real_clients)
32 arc_obb_mounter_client_.reset(ArcObbMounterClient::Create()); 33 arc_obb_mounter_client_.reset(ArcObbMounterClient::Create());
33 else 34 else
34 arc_obb_mounter_client_.reset(new FakeArcObbMounterClient); 35 arc_obb_mounter_client_.reset(new FakeArcObbMounterClient);
35 36
37 // TODO(shunhsingou) create fake implementation.
38 arc_trace_agent_.reset(ArcTraceAgent::Create());
39
36 if (use_real_clients) 40 if (use_real_clients)
37 auth_policy_client_.reset(AuthPolicyClient::Create()); 41 auth_policy_client_.reset(AuthPolicyClient::Create());
38 else 42 else
39 auth_policy_client_.reset(new FakeAuthPolicyClient); 43 auth_policy_client_.reset(new FakeAuthPolicyClient);
40 44
41 cros_disks_client_.reset(CrosDisksClient::Create( 45 cros_disks_client_.reset(CrosDisksClient::Create(
42 use_real_clients ? REAL_DBUS_CLIENT_IMPLEMENTATION 46 use_real_clients ? REAL_DBUS_CLIENT_IMPLEMENTATION
43 : FAKE_DBUS_CLIENT_IMPLEMENTATION)); 47 : FAKE_DBUS_CLIENT_IMPLEMENTATION));
44 48
45 if (use_real_clients) 49 if (use_real_clients)
(...skipping 26 matching lines...) Expand all
72 else 76 else
73 upstart_client_.reset(new FakeUpstartClient); 77 upstart_client_.reset(new FakeUpstartClient);
74 } 78 }
75 79
76 DBusClientsBrowser::~DBusClientsBrowser() {} 80 DBusClientsBrowser::~DBusClientsBrowser() {}
77 81
78 void DBusClientsBrowser::Initialize(dbus::Bus* system_bus) { 82 void DBusClientsBrowser::Initialize(dbus::Bus* system_bus) {
79 DCHECK(DBusThreadManager::IsInitialized()); 83 DCHECK(DBusThreadManager::IsInitialized());
80 84
81 arc_obb_mounter_client_->Init(system_bus); 85 arc_obb_mounter_client_->Init(system_bus);
86 arc_trace_agent_->Init(system_bus);
82 auth_policy_client_->Init(system_bus); 87 auth_policy_client_->Init(system_bus);
83 cros_disks_client_->Init(system_bus); 88 cros_disks_client_->Init(system_bus);
84 debug_daemon_client_->Init(system_bus); 89 debug_daemon_client_->Init(system_bus);
85 easy_unlock_client_->Init(system_bus); 90 easy_unlock_client_->Init(system_bus);
86 image_burner_client_->Init(system_bus); 91 image_burner_client_->Init(system_bus);
87 image_loader_client_->Init(system_bus); 92 image_loader_client_->Init(system_bus);
88 lorgnette_manager_client_->Init(system_bus); 93 lorgnette_manager_client_->Init(system_bus);
89 upstart_client_->Init(system_bus); 94 upstart_client_->Init(system_bus);
90 } 95 }
91 96
92 } // namespace chromeos 97 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698