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/arc/arc_util.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) {
   return "testarcpackage" + base::SizeTToString(id);
 }
 
-chromeos::FakeChromeUserManager* GetUserManager() {
-  return static_cast<chromeos::FakeChromeUserManager*>(
-      user_manager::UserManager::Get());
-}
-
-const user_manager::User* CreateUserAndLogin(Profile* profile, size_t id) {
-  std::string gaia_id = "1234567890" + base::SizeTToString(id);
-  const AccountId account_id(
-      AccountId::FromUserEmailGaiaId(profile->GetProfileUserName(), gaia_id));
-  const user_manager::User* user = GetUserManager()->AddUser(account_id);
-  GetUserManager()->LoginUser(account_id);
-  return user;
-}
-
 }  // namespace
 
 SyncArcPackageHelper* SyncArcPackageHelper::GetInstance() {
   SyncArcPackageHelper* instance = base::Singleton<SyncArcPackageHelper>::get();
   DCHECK(sync_datatype_helper::test());
   instance->SetupTest(sync_datatype_helper::test());
   return instance;
 }
 
 SyncArcPackageHelper::SyncArcPackageHelper()
-    : test_(nullptr), setup_completed_(false), user_manager_enabler_(nullptr) {}
+    : test_(nullptr), setup_completed_(false) {}
 
 SyncArcPackageHelper::~SyncArcPackageHelper() {}
 
 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();
-  size_t id = 0;
   for (auto* profile : test_->GetAllProfiles())
-    SetupArcService(profile, id++);
+    SetupArcService(profile);
   setup_completed_ = true;
 }
 
-void SyncArcPackageHelper::CleanUp() {
-  ArcSessionManager::Get()->Shutdown();
-  user_manager_enabler_.reset();
-}
-
 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;
   package.last_backup_time = id;
   package.sync = true;
@@ skipping 40 matching lines @@
         !ArcPackageDetailsMatch(profiles.front(), profile)) {
       DVLOG(1) << "Profile1: " << ArcPackageSyncableService::Get(profile);
       DVLOG(1) << "Profile2: "
                << ArcPackageSyncableService::Get(profiles.front());
       return false;
     }
   }
   return true;
 }
 
-void SyncArcPackageHelper::SetupArcService(Profile* profile, size_t id) {
+void SyncArcPackageHelper::SetupArcService(Profile* profile) {
   DCHECK(profile);
-  const user_manager::User* user = CreateUserAndLogin(profile, id);
-  // Have the user-to-profile mapping ready to avoid using the real profile
-  // manager (which is null).
-  chromeos::ProfileHelper::Get()->SetUserToProfileMappingForTesting(user,
-                                                                    profile);
-
-  ArcSessionManager* arc_session_manager = ArcSessionManager::Get();
-  DCHECK(arc_session_manager);
-  ArcSessionManager::DisableUIForTesting();
-  arc_session_manager->SetProfile(profile);
-  arc_session_manager->StartPreferenceHandler();

[skym, 2017/03/03 19:44:58]

So much deleted setup code, awesome!

   arc::SetArcPlayStoreEnabledForProfile(profile, 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(nullptr);

[skym, 2017/03/03 19:44:58]

Why does this need to be nulled out first?

[lgcheng, 2017/03/03 21:13:01]

This is due to the logic in instance_holder that does not allow change non-null
ptr to another non-null ptr. Also, create ArcAppListPrefs with null instance
holder in factory is also not allowed.

SetInstance(nullptr) is used to close the binding. The extra set null here will
keep the logic instance_holder in prod untouched.

   arc_app_list_prefs->app_instance_holder()->SetInstance(
       instance_map_[profile].get());
   // OnPackageListRefreshed will be called when AppInstance is ready.
   // For fakeAppInstance we use SendRefreshPackageList to make sure that
   // OnPackageListRefreshed will be called.
   instance_map_[profile]->SendRefreshPackageList(
       std::vector<arc::mojom::ArcPackageInfo>());
 }
 
 void SyncArcPackageHelper::InstallPackage(
@@ skipping 66 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