Introduce ArcServiceManager::OnShutdown().

components/arc/arc_service_manager.h

 // Copyright 2015 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.
 
 #ifndef COMPONENTS_ARC_ARC_SERVICE_MANAGER_H_
 #define COMPONENTS_ARC_ARC_SERVICE_MANAGER_H_
 
 #include <memory>
 #include <vector>
 
@@ skipping 10 matching lines @@
 class ArcBridgeService;
 class ArcIntentHelperObserver;
 class ArcService;
 
 // Manages creation and destruction of services that communicate with the ARC
 // instance via the ArcBridgeService.
 class ArcServiceManager {
  public:
   class Observer {
    public:
+    // Called when ArcServiceManager is being shut down. Observer
+    // implementation should clean up ARC related stuff here. One of the
+    // typical use cases is calling ArcServiceManager::RemoveObserver().
+    virtual void OnArcShutdown() = 0;
+
     // Called when intent filters are added or removed.
     virtual void OnIntentFiltersUpdated() = 0;
 
    protected:
     virtual ~Observer() = default;
   };
 
   explicit ArcServiceManager(
       scoped_refptr<base::TaskRunner> blocking_task_runner);
   ~ArcServiceManager();
 
   // |arc_bridge_service| can only be accessed on the thread that this
   // class was created on.
   ArcBridgeService* arc_bridge_service();
 
   // Adds a service to the managed services list.
   void AddService(std::unique_ptr<ArcService> service);
 
   // Gets the global instance of the ARC Service Manager. This can only be
   // called on the thread that this class was created on.
   static ArcServiceManager* Get();
 
-  // Returns if the ARC Service Manager instance exists.
-  // DO NOT CALL THIS. This function is a dirty workaround for properly shutting
-  // down chrome/browser/chromeos/extensions/file_manager/event_router.cc, and
-  // will likely be removed in the future.
-  static bool IsInitialized();
-
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
 
   // Called to shut down all ARC services.
   void Shutdown();
 
   scoped_refptr<base::TaskRunner> blocking_task_runner() const {
     return blocking_task_runner_;
   }
 
@@ skipping 30 matching lines @@
   scoped_refptr<LocalActivityResolver> activity_resolver_;
 
   base::ObserverList<Observer> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(ArcServiceManager);
 };
 
 }  // namespace arc
 
 #endif  // COMPONENTS_ARC_ARC_SERVICE_MANAGER_H_