arc: Add InstanceHelper::GetInstanceForMethod()

components/arc/storage_manager/arc_storage_manager.cc

Index: components/arc/storage_manager/arc_storage_manager.cc
diff --git a/components/arc/storage_manager/arc_storage_manager.cc b/components/arc/storage_manager/arc_storage_manager.cc
index b284d1af92b77edf6af35ef024864c6cb26a23af..76678cae090ba8ce6ddb917b64c6a7fb87cb1b09 100644
--- a/components/arc/storage_manager/arc_storage_manager.cc
+++ b/components/arc/storage_manager/arc_storage_manager.cc
@@ -40,49 +40,35 @@ ArcStorageManager* ArcStorageManager::Get() {
 }
 
 bool ArcStorageManager::OpenPrivateVolumeSettings() {
-  auto* storage_manager_instance = GetStorageManagerInstance();
-  if (!storage_manager_instance) {
+  auto* storage_manager_instance =
+      arc_bridge_service()->storage_manager()->GetInstanceForVersion(
+          kMinInstanceVersion, "OpenPrivateVolumeSettings");
+  if (!storage_manager_instance)
     return false;
-  }
   storage_manager_instance->OpenPrivateVolumeSettings();
   return true;
 }
 
 bool ArcStorageManager::GetApplicationsSize(
     const GetApplicationsSizeCallback& callback) {
-  auto* storage_manager_instance = GetStorageManagerInstance();
-  if (!storage_manager_instance) {
+  auto* storage_manager_instance =
+      arc_bridge_service()->storage_manager()->GetInstanceForVersion(
+          kMinInstanceVersion, "GetApplicationSize");

[Yusuke Sato, 2016/09/16 23:58:49]

Application*s*

[Luis Héctor Chávez, 2016/09/17 00:30:54]

Done.

+  if (!storage_manager_instance)
     return false;
-  }
   storage_manager_instance->GetApplicationsSize(callback);
   return true;
 }
 
 bool ArcStorageManager::DeleteApplicationsCache(
     const base::Callback<void()>& callback) {
-  auto* storage_manager_instance = GetStorageManagerInstance();
-  if (!storage_manager_instance) {
+  auto* storage_manager_instance =
+      arc_bridge_service()->storage_manager()->GetInstanceForVersion(
+          kMinInstanceVersion, "DeleteApplicationsCache");
+  if (!storage_manager_instance)
     return false;
-  }
   storage_manager_instance->DeleteApplicationsCache(callback);
   return true;
 }
 
-mojom::StorageManagerInstance* ArcStorageManager::GetStorageManagerInstance() {
-  auto* bridge_service = arc_bridge_service();
-  auto* storage_manager_instance =
-      bridge_service->storage_manager()->instance();
-  if (!storage_manager_instance) {
-    DLOG(WARNING) << "ARC storage manager instance is not ready.";
-    return nullptr;
-  }
-  auto storage_manager_version = bridge_service->storage_manager()->version();
-  if (storage_manager_version < kMinInstanceVersion) {
-    DLOG(ERROR) << "ARC storage manager instance (version "
-                << storage_manager_version << ") is too old.";
-    return nullptr;
-  }
-  return storage_manager_instance;
-}
-
 }  // namespace arc