[Merge To M54]:arc: Fix Android App resurrected by sync.

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 <string>
 #include <unordered_map>
 
 #include "base/command_line.h"
+#include "base/run_loop.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"
 #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"
@@ skipping 117 matching lines @@
       DVLOG(1) << "Profile2: "
                << ArcPackageSyncableService::Get(profiles.front());
       return false;
     }
   }
   return true;
 }
 
 void SyncArcPackageHelper::SetupArcService(Profile* profile, size_t id) {
   DCHECK(profile);
+  base::CommandLine::ForCurrentProcess()->AppendSwitch(
+      chromeos::switches::kEnableArc);
   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);
 
   ArcAuthService* auth_service = ArcAuthService::Get();
   DCHECK(auth_service);
   ArcAuthService::DisableUIForTesting();
   auth_service->OnPrimaryUserProfilePrepared(profile);
   auth_service->EnableArc();
 
   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].reset(new FakeAppInstance(arc_app_list_prefs));
   DCHECK(instance_map_[profile].get());
   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);
@@ skipping 63 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