Revert of arc: Use the new InstanceHolder for unittests

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

 // Copyright 2015 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 <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
 #include <map>
 #include <string>
@@ skipping 520 matching lines @@
   app_instance()->SendRefreshAppList(fake_apps());
 
   // Simulate item activate.
   const arc::mojom::AppInfo& app_first = fake_apps()[0];
   const arc::mojom::AppInfo& app_last = fake_apps()[0];
   ArcAppItem* item_first = FindArcItem(ArcAppTest::GetAppId(app_first));
   ArcAppItem* item_last = FindArcItem(ArcAppTest::GetAppId(app_last));
   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();
   ASSERT_EQ(3u, launch_requests.size());
   EXPECT_EQ(true, launch_requests[0]->IsForApp(app_first));
   EXPECT_EQ(true, launch_requests[1]->IsForApp(app_last));
   EXPECT_EQ(true, launch_requests[2]->IsForApp(app_first));
 
   // Test an attempt to launch of a not-ready app.
   bridge_service()->SetStopped();
@@ skipping 15 matching lines @@
   app_instance()->SendInstallShortcuts(fake_shortcuts());
 
   // Simulate item activate.
   const arc::mojom::ShortcutInfo& app_first = fake_shortcuts()[0];
   const arc::mojom::ShortcutInfo& app_last = fake_shortcuts()[0];
   ArcAppItem* item_first = FindArcItem(ArcAppTest::GetAppId(app_first));
   ArcAppItem* item_last = FindArcItem(ArcAppTest::GetAppId(app_last));
   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();
   ASSERT_EQ(3u, launch_intents.size());
   EXPECT_EQ(true, app_first.intent_uri == *launch_intents[0]);
   EXPECT_EQ(true, app_last.intent_uri == *launch_intents[1]);
   EXPECT_EQ(true, app_first.intent_uri == *launch_intents[2]);
 
   // Test an attempt to launch of a not-ready shortcut.
   bridge_service()->SetStopped();
@@ skipping 25 matching lines @@
       ArcAppItem* app_item = FindArcItem(ArcAppTest::GetAppId(app));
       ASSERT_NE(nullptr, app_item);
       const float scale = ui::GetScaleForScaleFactor(scale_factor);
       app_item->icon().GetRepresentation(scale);
     }
   }
 
   // Process pending tasks.
   content::BrowserThread::GetBlockingPool()->FlushForTesting();
   base::RunLoop().RunUntilIdle();
+  // 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 =
       app_instance()->icon_requests();
   EXPECT_EQ(expected_size, icon_requests.size());
   std::map<std::string, uint32_t> app_masks;
   for (size_t i = 0; i < icon_requests.size(); ++i) {
     const arc::FakeAppInstance::IconRequest* icon_request = icon_requests[i];
     const std::string id = ArcAppListPrefs::GetAppId(
         icon_request->package_name(), icon_request->activity());
@@ skipping 279 matching lines @@
   EXPECT_FALSE(launcher3.app_launched());
   EXPECT_TRUE(prefs->HasObserver(&launcher3));
 
   EXPECT_EQ(0u, app_instance()->launch_requests().size());
 
   std::vector<arc::mojom::AppInfo> apps(fake_apps().begin(),
                                         fake_apps().begin() + 2);
   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());
   EXPECT_FALSE(prefs->HasObserver(&launcher1));
   EXPECT_TRUE(prefs->HasObserver(&launcher3));
 
   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));
 }