Always use arc::InstanceHolder<T>::GetInstanceForMethod

chrome/browser/sync/test/integration/sync_arc_package_helper.cc

 // 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.
 
 #include "chrome/browser/sync/test/integration/sync_arc_package_helper.h"
 
+#include <memory>
 #include <string>
 #include <unordered_map>
+#include <vector>
 
 #include "base/command_line.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/chromeos/arc/arc_auth_service.h"
 #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
@@ skipping 145 matching lines @@
   arc_app_list_prefs->app_instance_holder()->SetInstance(
       instance_map_[profile].get());
 }
 
 void SyncArcPackageHelper::InstallPackage(
     Profile* profile,
     const mojom::ArcPackageInfo& package) {
   ArcAppListPrefs* arc_app_list_prefs = ArcAppListPrefs::Get(profile);
   DCHECK(arc_app_list_prefs);
   FakeAppInstance* fake_app_instance = static_cast<FakeAppInstance*>(
-      arc_app_list_prefs->app_instance_holder()->instance());
+      arc_app_list_prefs->app_instance_holder()->GetInstanceForMethod(
+          "InstallPackage"));
 
   DCHECK(fake_app_instance);
   // After this function, new package should be added to local sync service
   // and install event should be sent to sync server.
   fake_app_instance->InstallPackage(package.Clone());
 }
 
 void SyncArcPackageHelper::UninstallPackage(Profile* profile,
                                             const std::string& package_name) {
   ArcAppListPrefs* arc_app_list_prefs = ArcAppListPrefs::Get(profile);
   DCHECK(arc_app_list_prefs);
   FakeAppInstance* fake_app_instance = static_cast<FakeAppInstance*>(
-      arc_app_list_prefs->app_instance_holder()->instance());
+      arc_app_list_prefs->app_instance_holder()->GetInstanceForMethod(
+          "UninstallPackage"));
   DCHECK(fake_app_instance);
   // After this function, package should be removed from local sync service
   // and uninstall event should be sent to sync server.
   fake_app_instance->UninstallPackage(package_name);
 }
 
 // Packages from local pref are used for these test functions. Packages in local
 // pref should be indentical to syncservice after syncservice is launched.
 // Packagd update behavior is not synced by design.
 bool SyncArcPackageHelper::ArcPackagesMatch(Profile* profile1,
@@ skipping 37 matching lines @@
     if (package1_info->last_backup_android_id !=
         package2_info->last_backup_android_id)
       return false;
     if (package1_info->last_backup_time != package2_info->last_backup_time)
       return false;
   }
   return true;
 }
 
 }  // namespace arc