| Index: components/arc/arc_service_manager.cc
|
| diff --git a/components/arc/arc_service_manager.cc b/components/arc/arc_service_manager.cc
|
| index 4ef712209f85b98ce047c6ca595e99323cc16f54..fad25e556538d8c4189586253acac395e1abefc0 100644
|
| --- a/components/arc/arc_service_manager.cc
|
| +++ b/components/arc/arc_service_manager.cc
|
| @@ -16,7 +16,6 @@
|
| #include "components/arc/crash_collector/arc_crash_collector_bridge.h"
|
| #include "components/arc/ime/arc_ime_service.h"
|
| #include "components/arc/intent_helper/activity_icon_loader.h"
|
| -#include "components/arc/intent_helper/arc_intent_helper_bridge.h"
|
| #include "components/arc/metrics/arc_metrics_service.h"
|
| #include "components/arc/net/arc_net_host_impl.h"
|
| #include "components/arc/obb_mounter/arc_obb_mounter_bridge.h"
|
| @@ -39,7 +38,8 @@ ArcBridgeService* g_arc_bridge_service_for_testing = nullptr;
|
|
|
| ArcServiceManager::ArcServiceManager(
|
| scoped_refptr<base::TaskRunner> blocking_task_runner)
|
| - : blocking_task_runner_(blocking_task_runner) {
|
| + : blocking_task_runner_(blocking_task_runner),
|
| + icon_loader_(new ActivityIconLoader) {
|
| DCHECK(!g_arc_service_manager);
|
| g_arc_service_manager = this;
|
|
|
| @@ -57,9 +57,6 @@ ArcServiceManager::ArcServiceManager(
|
| AddService(
|
| base::WrapUnique(new ArcCrashCollectorBridge(arc_bridge_service())));
|
| AddService(base::WrapUnique(new ArcImeService(arc_bridge_service())));
|
| - icon_loader_ = new ActivityIconLoader;
|
| - AddService(base::WrapUnique(
|
| - new ArcIntentHelperBridge(arc_bridge_service(), icon_loader_)));
|
| AddService(base::WrapUnique(new ArcMetricsService(arc_bridge_service())));
|
| AddService(base::WrapUnique(new ArcNetHostImpl(arc_bridge_service())));
|
| AddService(base::WrapUnique(new ArcObbMounterBridge(arc_bridge_service())));
|
|
|