Introduce ArcServiceManager::OnShutdown().

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 383 matching lines @@
       dispatch_directory_change_event_impl_(
           base::Bind(&EventRouter::DispatchDirectoryChangeEventImpl,
                      base::Unretained(this))),
       weak_factory_(this) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   ObserveEvents();
 }
 
 EventRouter::~EventRouter() = default;
 
+void EventRouter::OnArcShutdown() {
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  arc::ArcServiceManager::Get()->RemoveObserver(this);
+}
+
 void EventRouter::OnIntentFiltersUpdated() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(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())
-    arc::ArcServiceManager::Get()->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 572 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