Fix ArcAppModelBuilderTest

chrome/browser/ui/app_list/arc/arc_app_test.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/ui/app_list/arc/arc_app_test.h"
 
 #include "base/command_line.h"
 #include "base/strings/stringprintf.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/ui/app_list/arc/arc_app_list_prefs.h"
 #include "chromeos/chromeos_switches.h"
 #include "components/arc/arc_bridge_service.h"
 #include "components/arc/test/fake_app_instance.h"
 #include "components/arc/test/fake_arc_bridge_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
@@ skipping 22 matching lines @@
 chromeos::FakeChromeUserManager* ArcAppTest::GetUserManager() {
   return static_cast<chromeos::FakeChromeUserManager*>(
       user_manager::UserManager::Get());
 }
 
 void ArcAppTest::SetUp(Profile* profile) {
   base::CommandLine::ForCurrentProcess()->AppendSwitch(
       chromeos::switches::kEnableArc);
   DCHECK(!profile_);
   profile_ = profile;
-  CreateUserAndLogin();
+  const user_manager::User* user = CreateUserAndLogin();
+
+  // If for any reason the garbage collector kicks in while we are waiting for
+  // an icon, have the user-to-profile mapping ready to avoid using the real
+  // profile manager (which is null).
+  chromeos::ProfileHelper::Get()->SetUserToProfileMappingForTesting(user,
+                                                                    profile_);
 
   // Make sure we have enough data for test.
   for (int i = 0; i < 3; ++i) {
     arc::mojom::AppInfo app;
     app.name = base::StringPrintf("Fake App %d", i);
     app.package_name = base::StringPrintf("fake.app.%d", i);
     app.activity = base::StringPrintf("fake.app.%d.activity", i);
     app.sticky = false;
     fake_apps_.push_back(app);
   }
@@ skipping 58 matching lines @@
 
   // At this point we should have ArcAppListPrefs as observer of service.
   EXPECT_TRUE(bridge_service_->HasObserver(arc_app_list_pref_));
   bridge_service()->SetReady();
 }
 
 void ArcAppTest::TearDown() {
   auth_service_.reset();
 }
 
-void ArcAppTest::CreateUserAndLogin() {
+const user_manager::User* ArcAppTest::CreateUserAndLogin() {
   const AccountId account_id(AccountId::FromUserEmailGaiaId(
       profile_->GetProfileUserName(), "1234567890"));
-  GetUserManager()->AddUser(account_id);
+  const user_manager::User* user = GetUserManager()->AddUser(account_id);
   GetUserManager()->LoginUser(account_id);
+  return user;
 }
 
 void ArcAppTest::AddPackage(const arc::mojom::ArcPackageInfo& package) {
   if (!FindPackage(package))
     fake_packages_.push_back(package);
 }
 
 void ArcAppTest::RemovePackage(const arc::mojom::ArcPackageInfo& package) {
   std::vector<arc::mojom::ArcPackageInfo>::iterator iter;
   for (iter = fake_packages_.begin(); iter != fake_packages_.end(); iter++) {
     if ((*iter).package_name == package.package_name) {
       fake_packages_.erase(iter);
       break;
     }
   }
 }
 
 bool ArcAppTest::FindPackage(const arc::mojom::ArcPackageInfo& package) {
   for (auto fake_package : fake_packages_) {
     if (package.package_name == fake_package.package_name)
       return true;
   }
   return false;
 }