Revert of arc: Use the new InstanceHolder for unittests

components/arc/test/fake_app_instance.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 "components/arc/test/fake_app_instance.h"
 
 #include <stdint.h>
 
 #include <string>
 #include <vector>
@@ skipping 20 matching lines @@
       const arc::mojom::ArcPackageInfo& package_info) {
     return package_info.Clone();
   }
 };
 
 }  // namespace mojo
 
 namespace arc {
 
 FakeAppInstance::FakeAppInstance(mojom::AppHost* app_host)
-    : app_host_(app_host) {}
+    : binding_(this), app_host_(app_host) {}
 FakeAppInstance::~FakeAppInstance() {}
 
 void FakeAppInstance::RefreshAppList() {
   ++refresh_app_list_count_;
 }
 
 void FakeAppInstance::LaunchApp(const mojo::String& package_name,
                                 const mojo::String& activity,
                                 const gfx::Rect& dimension) {
   launch_requests_.push_back(new Request(package_name, activity));
@@ skipping 107 matching lines @@
 }
 
 void FakeAppInstance::SendPackageAdded(const mojom::ArcPackageInfo& package) {
   app_host_->OnPackageAdded(mojom::ArcPackageInfoPtr(package.Clone()));
 }
 
 void FakeAppInstance::SendPackageUninstalled(const mojo::String& package_name) {
   app_host_->OnPackageRemoved(package_name);
 }
 
+void FakeAppInstance::WaitForIncomingMethodCall() {
+  binding_.WaitForIncomingMethodCall();
+}
+
+void FakeAppInstance::WaitForOnAppInstanceReady() {
+  // Several messages are sent back and forth when OnAppInstanceReady() is
+  // called. Normally, it would be preferred to use a single
+  // WaitForIncomingMethodCall() to wait for each method individually, but
+  // QueryVersion() does require processing on the I/O thread, so
+  // RunUntilIdle() is required to correctly dispatch it. On slower machines
+  // (and when running under Valgrind), the two thread hops needed to send and
+  // dispatch each Mojo message might not be picked up by a single
+  // RunUntilIdle(), so keep pumping the message loop until all expected
+  // messages are.
+  while (refresh_app_list_count_ != 1) {
+    base::RunLoop().RunUntilIdle();
+  }
+}
+
 void FakeAppInstance::CanHandleResolution(
     const mojo::String& package_name,
     const mojo::String& activity,
     const gfx::Rect& dimension,
     const CanHandleResolutionCallback& callback) {
   callback.Run(true);
 }
 
 void FakeAppInstance::UninstallPackage(const mojo::String& package_name) {
 }
@@ skipping 41 matching lines @@
 
   std::string png_data_as_string;
   if (GetFakeIcon(scale_factor, &png_data_as_string)) {
     callback.Run(mojo::Array<uint8_t>::From(png_data_as_string));
   }
 }
 
 void FakeAppInstance::RemoveCachedIcon(const mojo::String& icon_resource_id) {}
 
 }  // namespace arc