arc: Remove ArcServiceManager::Observer

chrome/browser/chromeos/extensions/file_manager/event_router.cc

 // Copyright 2014 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/extensions/file_manager/event_router.h"
 
 #include <stddef.h>
 
 #include <set>
 #include <utility>
@@ skipping 394 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   BroadcastEvent(profile_,
                  extensions::events::FILE_MANAGER_PRIVATE_ON_APPS_UPDATED,
                  file_manager_private::OnAppsUpdated::kEventName,
                  file_manager_private::OnAppsUpdated::Create());
 }
 
 void EventRouter::Shutdown() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
-  if (arc::ArcServiceManager::IsInitialized())

[Yusuke Sato, 2017/01/11 23:12:37]

kinaba: I've removed IsInitialized() from the manager class and used Get()
instead. Since hidehiko@ recently removed the DCHECK() from the getter, we can
safely call the getter in Shutdown() now.

-    arc::ArcServiceManager::Get()->RemoveObserver(this);
+  auto* intent_helper =
+      arc::ArcIntentHelperBridge::Get(arc::ArcServiceManager::Get());
+  if (intent_helper)
+    intent_helper->RemoveObserver(this);
 
   chromeos::system::TimezoneSettings::GetInstance()->RemoveObserver(this);
 
   DLOG_IF(WARNING, !file_watchers_.empty())
       << "Not all file watchers are "
       << "removed. This can happen when Files.app is open during shutdown.";
   file_watchers_.clear();
   if (!profile_) {
     NOTREACHED();
     return;
@@ skipping 72 matching lines @@
                  weak_factory_.GetWeakPtr());
   pref_change_registrar_->Add(drive::prefs::kDisableDriveOverCellular,
                               callback);
   pref_change_registrar_->Add(drive::prefs::kDisableDriveHostedFiles, callback);
   pref_change_registrar_->Add(drive::prefs::kDisableDrive, callback);
   pref_change_registrar_->Add(prefs::kSearchSuggestEnabled, callback);
   pref_change_registrar_->Add(prefs::kUse24HourClock, callback);
 
   chromeos::system::TimezoneSettings::GetInstance()->AddObserver(this);
 
-  if (arc::ArcSessionManager::IsAllowedForProfile(profile_))
-    arc::ArcServiceManager::Get()->AddObserver(this);
+  if (arc::ArcSessionManager::IsAllowedForProfile(profile_)) {
+    auto* intent_helper =
+        arc::ArcIntentHelperBridge::Get(arc::ArcServiceManager::Get());
+    if (intent_helper)
+      intent_helper->AddObserver(this);
+  }
 }
 
 // File watch setup routines.
 void EventRouter::AddFileWatch(const base::FilePath& local_path,
                                const base::FilePath& virtual_path,
                                const std::string& extension_id,
                                const BoolCallback& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DCHECK(!callback.is_null());
 
@@ skipping 479 matching lines @@
 void EventRouter::SetDispatchDirectoryChangeEventImplForTesting(
     const DispatchDirectoryChangeEventImplCallback& callback) {
   dispatch_directory_change_event_impl_ = callback;
 }
 
 base::WeakPtr<EventRouter> EventRouter::GetWeakPtr() {
   return weak_factory_.GetWeakPtr();
 }
 
 }  // namespace file_manager