Fix Arc integration test.

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 <vector>
 
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/chromeos/arc/arc_session_manager.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"
 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"
-#include "chrome/browser/ui/app_list/arc/arc_app_list_prefs_factory.h"
 #include "chrome/browser/ui/app_list/arc/arc_package_syncable_service.h"
 #include "chromeos/chromeos_switches.h"
 #include "components/arc/arc_bridge_service.h"
 #include "components/arc/test/fake_app_instance.h"
 
 namespace arc {
 
 namespace {
 
 std::string GetTestPackageName(size_t id) {
@@ skipping 30 matching lines @@
 
 void SyncArcPackageHelper::SetupTest(SyncTest* test) {
   if (setup_completed_) {
     DCHECK_EQ(test, test_);
     return;
   }
   test_ = test;
 
   user_manager_enabler_ = base::MakeUnique<chromeos::ScopedUserManagerEnabler>(
       new chromeos::FakeChromeUserManager());
-  ArcAppListPrefsFactory::SetFactoryForSyncTest();
+  InstanceHolder<mojom::AppInstance>::SetInstanceHolderForSyncTest();
+  ArcSessionManager::SetSessionManagerForSyncTest();
   size_t id = 0;
   for (auto* profile : test_->GetAllProfiles())
     SetupArcService(profile, id++);
   setup_completed_ = true;
 }
 
 void SyncArcPackageHelper::CleanUp() {
   ArcSessionManager::Get()->Shutdown();
   user_manager_enabler_.reset();
+  chromeos::ProfileHelper::Get()->ClearUserToProfileMappingForTesting();
 }
 
 void SyncArcPackageHelper::InstallPackageWithIndex(Profile* profile,
                                                    size_t id) {
   std::string package_name = GetTestPackageName(id);
 
   mojom::ArcPackageInfo package;
   package.package_name = package_name;
   package.package_version = id;
   package.last_backup_android_id = id;
@@ skipping 58 matching lines @@
                                                                     profile);
 
   ArcSessionManager* arc_session_manager = ArcSessionManager::Get();
   DCHECK(arc_session_manager);
   ArcSessionManager::DisableUIForTesting();
   arc_session_manager->OnPrimaryUserProfilePrepared(profile);
   arc_session_manager->SetArcPlayStoreEnabled(true);
 
   ArcAppListPrefs* arc_app_list_prefs = ArcAppListPrefs::Get(profile);
   DCHECK(arc_app_list_prefs);
-
   base::RunLoop run_loop;
   arc_app_list_prefs->SetDefaltAppsReadyCallback(run_loop.QuitClosure());
   run_loop.Run();
 
   instance_map_[profile] =
       base::MakeUnique<FakeAppInstance>(arc_app_list_prefs);
   DCHECK(instance_map_[profile].get());
   arc_app_list_prefs->app_instance_holder()->SetInstance(
       instance_map_[profile].get());
   // OnPackageListRefreshed will be called when AppInstance is ready.
@@ skipping 73 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