[Merge-M54] arc: Add support of default and OEM apps.

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/run_loop.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 "chrome/browser/ui/app_list/arc/arc_app_list_prefs_factory.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/dbus_thread_manager.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 {
 
 constexpr char kPackageName1[] = "fake.package.name1";
 constexpr char kPackageName2[] = "fake.package.name2";
 constexpr char kPackageName3[] = "fake.package.name3";
 }
 
 // static
 std::string ArcAppTest::GetAppId(const arc::mojom::AppInfo& app_info) {
   return ArcAppListPrefs::GetAppId(app_info.package_name, app_info.activity);
 }
 
+// static
 std::string ArcAppTest::GetAppId(const arc::mojom::ShortcutInfo& shortcut) {
   return ArcAppListPrefs::GetAppId(shortcut.package_name, shortcut.intent_uri);
 }
 
 ArcAppTest::ArcAppTest() {
   user_manager_enabler_.reset(new chromeos::ScopedUserManagerEnabler(
       new chromeos::FakeChromeUserManager()));
 }
 
 ArcAppTest::~ArcAppTest() {
@@ skipping 13 matching lines @@
       chromeos::switches::kEnableArc);
   DCHECK(!profile_);
   profile_ = profile;
   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_);
-
+  arc::mojom::AppInfo app;
   // 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);
   }
   fake_apps_[0].sticky = true;
 
+  app.name = "TestApp1";
+  app.package_name = "test.app1";
+  app.activity = "test.app1.activity";
+  app.sticky = true;
+  fake_default_apps_.push_back(app);
+
+  app.name = "TestApp2";
+  app.package_name = "test.app2";
+  app.activity = "test.app2.activity";
+  app.sticky = true;
+  fake_default_apps_.push_back(app);
+
   arc::mojom::ArcPackageInfo package1;
   package1.package_name = kPackageName1;
   package1.package_version = 1;
   package1.last_backup_android_id = 1;
   package1.last_backup_time = 1;
   package1.sync = false;
   fake_packages_.push_back(package1);
 
   arc::mojom::ArcPackageInfo package2;
   package2.package_name = kPackageName2;
@@ skipping 28 matching lines @@
   if (!arc_app_list_pref_) {
     ArcAppListPrefsFactory::GetInstance()->RecreateServiceInstanceForTesting(
         profile_);
   }
   bridge_service_.reset(new arc::FakeArcBridgeService());
 
   auth_service_.reset(new arc::ArcAuthService(bridge_service_.get()));
   DCHECK(arc::ArcAuthService::Get());
   arc::ArcAuthService::DisableUIForTesting();
   arc_auth_service()->OnPrimaryUserProfilePrepared(profile_);
-  auth_service_->EnableArc();
 
   arc_app_list_pref_ = ArcAppListPrefs::Get(profile_);
   DCHECK(arc_app_list_pref_);
+  base::RunLoop run_loop;
+  arc_app_list_pref_->SetDefaltAppsReadyCallback(run_loop.QuitClosure());
+  run_loop.Run();
 
+  auth_service_->EnableArc();
   app_instance_.reset(new arc::FakeAppInstance(arc_app_list_pref_));
   bridge_service_->app()->SetInstance(app_instance_.get());
 
   // Check initial conditions.
   EXPECT_EQ(bridge_service_.get(), arc::ArcBridgeService::Get());
   EXPECT_FALSE(arc::ArcBridgeService::Get()->ready());
 }
 
 void ArcAppTest::TearDown() {
   auth_service_.reset();
@@ skipping 39 matching lines @@
   }
 }
 
 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;
 }