arc: Revamp the ArcBridgeService interface

components/arc/storage_manager/arc_storage_manager.h

 // 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.
 
-#ifndef COMPONENTS_ARC_STORAGE_MANAGER_ARC_STORAGE_MANAGER_H
-#define COMPONENTS_ARC_STORAGE_MANAGER_ARC_STORAGE_MANAGER_H
+#ifndef COMPONENTS_ARC_STORAGE_MANAGER_ARC_STORAGE_MANAGER_H_
+#define COMPONENTS_ARC_STORAGE_MANAGER_ARC_STORAGE_MANAGER_H_
 
 #include <memory>
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "components/arc/arc_bridge_service.h"
 #include "components/arc/arc_service.h"
 #include "components/arc/common/storage_manager.mojom.h"
 
 namespace arc {
 
 // This class represents as a simple proxy of StorageManager to Chrome OS.
-class ArcStorageManager : public ArcService,
-                          public ArcBridgeService::Observer {
+class ArcStorageManager : public ArcService {
  public:
   explicit ArcStorageManager(ArcBridgeService* bridge_service);
   ~ArcStorageManager() override;
 
   // Gets the singleton instance of the ARC Storage Manager.
   // MUST be called while ArcStorageManager is alive, otherwise it returns
   // nullptr (or aborts on Debug build).
   static ArcStorageManager* Get();
 
-  // ArcBridgeService::Observer
-  void OnStorageManagerInstanceReady() override;
-
   // Opens detailed preference screen of private volume on ARC.
   // Returns false when an instance of ARC-side isn't ready yet.
   bool OpenPrivateVolumeSettings();
 
   // Gets storage usage of all application's APK, data, and cache size.
-  using GetApplicationsSizeCallback = base::Callback<
-      void(bool succeeded, arc::mojom::ApplicationsSizePtr)>;
+  using GetApplicationsSizeCallback =
+      base::Callback<void(bool succeeded, arc::mojom::ApplicationsSizePtr)>;
   bool GetApplicationsSize(const GetApplicationsSizeCallback& callback);
 
   // Deletes all applications' cache files.
   bool DeleteApplicationsCache(const base::Callback<void()>& callback);
 
  private:
   mojom::StorageManagerInstance* GetStorageManagerInstance();
 
   DISALLOW_COPY_AND_ASSIGN(ArcStorageManager);
 };
 
 }  // namespace arc
 
-#endif  // COMPONENTS_ARC_STORAGE_MANAGER_ARC_STORAGE_MANAGER_H
+#endif  // COMPONENTS_ARC_STORAGE_MANAGER_ARC_STORAGE_MANAGER_H_