Notify Files App when ARC++ app is installed/removed

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"
@@ skipping 27 matching lines @@
   arc_service_manager_->AddService(base::MakeUnique<ArcBootErrorNotification>(
       arc_service_manager_->arc_bridge_service()));
   arc_service_manager_->AddService(
       base::MakeUnique<ArcContentFileSystemService>(
           arc_service_manager_->arc_bridge_service()));
   arc_service_manager_->AddService(base::MakeUnique<ArcDownloadsWatcherService>(
       arc_service_manager_->arc_bridge_service()));
   arc_service_manager_->AddService(
       base::MakeUnique<ArcEnterpriseReportingService>(
           arc_service_manager_->arc_bridge_service()));
-  arc_service_manager_->AddService(base::MakeUnique<ArcIntentHelperBridge>(
+  auto intent_helper = base::MakeUnique<ArcIntentHelperBridge>(
       arc_service_manager_->arc_bridge_service(),
       arc_service_manager_->icon_loader(),
-      arc_service_manager_->activity_resolver()));
+      arc_service_manager_->activity_resolver());
+  // We don't have to remove observer since
+  // ArcServiceManager always outlives ArcIntentHelperBridge.
+  intent_helper->AddObserver(arc_service_manager_.get());
+  arc_service_manager_->AddService(std::move(intent_helper));
   arc_service_manager_->AddService(base::MakeUnique<ArcPolicyBridge>(
       arc_service_manager_->arc_bridge_service()));
   arc_service_manager_->AddService(base::MakeUnique<ArcPrintService>(
       arc_service_manager_->arc_bridge_service()));
   arc_service_manager_->AddService(base::MakeUnique<ArcProcessService>(
       arc_service_manager_->arc_bridge_service()));
   arc_service_manager_->AddService(base::MakeUnique<ArcSettingsService>(
       arc_service_manager_->arc_bridge_service()));
   arc_service_manager_->AddService(base::MakeUnique<ArcTtsService>(
       arc_service_manager_->arc_bridge_service()));
   arc_service_manager_->AddService(base::MakeUnique<ArcWallpaperService>(
       arc_service_manager_->arc_bridge_service()));
   arc_service_manager_->AddService(base::MakeUnique<GpuArcVideoServiceHost>(
       arc_service_manager_->arc_bridge_service()));
 }
 
 void ArcServiceLauncher::Shutdown() {
   DCHECK(arc_service_manager_);
   arc_service_manager_->Shutdown();
 }
 
 }  // namespace arc