Reland of arc: Use the new InstanceHolder for unittests

chrome/browser/ui/app_list/arc/arc_app_unittest.cc

Index: chrome/browser/ui/app_list/arc/arc_app_unittest.cc
diff --git a/chrome/browser/ui/app_list/arc/arc_app_unittest.cc b/chrome/browser/ui/app_list/arc/arc_app_unittest.cc
index a30fa54e229c7d7e38c1fe25cd6d9a3a4188edc7..17178f19f79779cfb1e757a95447e9db6ce6b59f 100644
--- a/chrome/browser/ui/app_list/arc/arc_app_unittest.cc
+++ b/chrome/browser/ui/app_list/arc/arc_app_unittest.cc
@@ -553,11 +553,8 @@ TEST_F(ArcAppModelBuilderTest, LaunchApps) {
   ASSERT_NE(nullptr, item_first);
   ASSERT_NE(nullptr, item_last);
   item_first->Activate(0);
-  app_instance()->WaitForIncomingMethodCall();
   item_last->Activate(0);
-  app_instance()->WaitForIncomingMethodCall();
   item_first->Activate(0);
-  app_instance()->WaitForIncomingMethodCall();
 
   const ScopedVector<arc::FakeAppInstance::Request>& launch_requests =
       app_instance()->launch_requests();
@@ -593,11 +590,8 @@ TEST_F(ArcAppModelBuilderTest, LaunchShortcuts) {
   ASSERT_NE(nullptr, item_first);
   ASSERT_NE(nullptr, item_last);
   item_first->Activate(0);
-  app_instance()->WaitForIncomingMethodCall();
   item_last->Activate(0);
-  app_instance()->WaitForIncomingMethodCall();
   item_first->Activate(0);
-  app_instance()->WaitForIncomingMethodCall();
 
   const ScopedVector<mojo::String>& launch_intents =
       app_instance()->launch_intents();
@@ -645,14 +639,7 @@ TEST_F(ArcAppModelBuilderTest, RequestIcons) {
     }
   }
 
-  // Normally just one call to RunUntilIdle() suffices to make sure
-  // all RequestAppIcon() calls are delivered, but on slower machines
-  // (especially when running under Valgrind), they might not get
-  // delivered on time. Wait for the remaining tasks individually.
   const size_t expected_size = scale_factors.size() * fake_apps().size();
-  while (app_instance()->icon_requests().size() < expected_size) {
-    app_instance()->WaitForIncomingMethodCall();
-  }
 
   // At this moment we should receive all requests for icon loading.
   const ScopedVector<arc::FakeAppInstance::IconRequest>& icon_requests =
@@ -940,7 +927,6 @@ TEST_F(ArcAppModelBuilderTest, AppLauncher) {
   app_instance()->SendRefreshAppList(apps);
 
   EXPECT_TRUE(launcher1.app_launched());
-  app_instance()->WaitForIncomingMethodCall();
   ASSERT_EQ(1u, app_instance()->launch_requests().size());
   EXPECT_TRUE(app_instance()->launch_requests()[0]->IsForApp(app1));
   EXPECT_FALSE(launcher3.app_launched());
@@ -949,7 +935,6 @@ TEST_F(ArcAppModelBuilderTest, AppLauncher) {
 
   ArcAppLauncher launcher2(profile(), id2, true);
   EXPECT_TRUE(launcher2.app_launched());
-  app_instance()->WaitForIncomingMethodCall();
   EXPECT_FALSE(prefs->HasObserver(&launcher2));
   ASSERT_EQ(2u, app_instance()->launch_requests().size());
   EXPECT_TRUE(app_instance()->launch_requests()[1]->IsForApp(app2));