arc: Remove ArcServiceManager::Observer

chrome/browser/chromeos/note_taking_helper.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/note_taking_helper.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "apps/launcher.h"
 #include "ash/common/system/chromeos/palette/palette_utils.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/string_split.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/file_manager/path_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/chromeos_switches.h"
 #include "components/arc/arc_bridge_service.h"
 #include "components/arc/arc_service_manager.h"
-#include "components/arc/common/intent_helper.mojom.h"
+#include "components/arc/intent_helper/arc_intent_helper_bridge.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/common/api/app_runtime.h"
 #include "extensions/common/extension.h"
 #include "url/gurl.h"
 
 namespace app_runtime = extensions::api::app_runtime;
 
@@ skipping 181 matching lines @@
        g_browser_process->profile_manager()->GetLoadedProfiles()) {
     extension_registry_observer_.Add(
         extensions::ExtensionRegistry::Get(profile));
   }
 
   // Check if the primary profile has already enabled ARC and watch for changes.
   auto session_manager = arc::ArcSessionManager::Get();
   session_manager->AddObserver(this);
   android_enabled_ = session_manager->IsArcEnabled();
 
-  // ArcServiceManager will notify us about changes to the list of available
+  // ArcIntentHelperBridge will notify us about changes to the list of available
   // Android apps.
-  auto service_manager = arc::ArcServiceManager::Get();
-  service_manager->AddObserver(this);
+  auto intent_helper_bridge =
+      arc::ArcServiceManager::GetGlobalService<arc::ArcIntentHelperBridge>();
+  if (intent_helper_bridge)
+    intent_helper_bridge->AddObserver(this);
 
   // If the ARC intent helper is ready, get the Android apps. Otherwise,
   // UpdateAndroidApps() will be called when ArcServiceManager calls
   // OnIntentFiltersUpdated().
   if (android_enabled_ &&
       arc::ArcServiceManager::Get()
           ->arc_bridge_service()
           ->intent_helper()
           ->has_instance())
     UpdateAndroidApps();
 }
 
 NoteTakingHelper::~NoteTakingHelper() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   // ArcSessionManagerTest shuts down ARC before NoteTakingHelper.
-  if (arc::ArcServiceManager::Get())
-    arc::ArcServiceManager::Get()->RemoveObserver(this);
+  auto intent_helper_bridge =
+      arc::ArcServiceManager::GetGlobalService<arc::ArcIntentHelperBridge>();
+  if (intent_helper_bridge)
+    intent_helper_bridge->RemoveObserver(this);
   if (arc::ArcSessionManager::Get())
     arc::ArcSessionManager::Get()->RemoveObserver(this);
 }
 
 bool NoteTakingHelper::IsWhitelistedChromeApp(
     const extensions::Extension* extension) const {
   DCHECK(extension);
   return std::find(whitelisted_chrome_app_ids_.begin(),
                    whitelisted_chrome_app_ids_.end(),
                    extension->id()) != whitelisted_chrome_app_ids_.end();
@@ skipping 130 matching lines @@
     for (auto& observer : observers_)
       observer.OnAvailableNoteTakingAppsUpdated();
   }
 }
 
 void NoteTakingHelper::OnShutdown(extensions::ExtensionRegistry* registry) {
   extension_registry_observer_.Remove(registry);
 }
 
 }  // namespace chromeos