Revert of arc: Use the new InstanceHolder for unittests

components/arc/test/fake_app_instance.h

 // 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.
 
 #ifndef COMPONENTS_ARC_TEST_FAKE_APP_INSTANCE_H_
 #define COMPONENTS_ARC_TEST_FAKE_APP_INSTANCE_H_
 
 #include <map>
 #include <memory>
 #include <string>
@@ skipping 61 matching lines @@
    private:
     std::string icon_resource_id_;
     int scale_factor_;
 
     DISALLOW_COPY_AND_ASSIGN(ShortcutIconRequest);
   };
 
   explicit FakeAppInstance(mojom::AppHost* app_host);
   ~FakeAppInstance() override;
 
+  void Bind(mojo::InterfaceRequest<mojom::AppInstance> interface_request) {
+    binding_.Bind(std::move(interface_request));
+  }
+
   // mojom::AppInstance overrides:
   void Init(mojom::AppHostPtr host_ptr) override {}
   void RefreshAppList() override;
   void LaunchApp(const mojo::String& package_name,
                  const mojo::String& activity,
                  const gfx::Rect& dimension) override;
   void RequestAppIcon(const mojo::String& package_name,
                       const mojo::String& activity,
                       mojom::ScaleFactor scale_factor) override;
   void LaunchIntent(const mojo::String& intent_uri,
@@ skipping 49 matching lines @@
   }
 
   const ScopedVector<IconRequest>& icon_requests() const {
     return icon_requests_;
   }
 
   const ScopedVector<ShortcutIconRequest>& shortcut_icon_requests() const {
     return shortcut_icon_requests_;
   }
 
+  // This method can be called on tests when a method is intended to
+  // be called across a Mojo proxy.
+  void WaitForIncomingMethodCall();
+
+  // As part of the initialization process, the instance side calls
+  // mojom::AppHost::OnAppInstanceReady(), which in turn calls
+  // mojom::AppInstance::Init() and
+  // mojom::AppInstance::RefreshAppList(). This method should be called after a
+  // call
+  // to mojom::ArcBridgeHost::OnAppInstanceReady() to make sure all method calls
+  // have
+  // been dispatched.
+  void WaitForOnAppInstanceReady();
+
  private:
   using TaskIdToInfo = std::map<int32_t, std::unique_ptr<Request>>;
   // Mojo endpoints.
+  mojo::Binding<mojom::AppInstance> binding_;
   mojom::AppHost* app_host_;
   // Number of RefreshAppList calls.
   int refresh_app_list_count_ = 0;
   // Keeps information about launch requests.
   ScopedVector<Request> launch_requests_;
   // Keeps information about launch intents.
   ScopedVector<mojo::String> launch_intents_;
   // Keeps information about icon load requests.
   ScopedVector<IconRequest> icon_requests_;
   // Keeps information about shortcut icon load requests.
   ScopedVector<ShortcutIconRequest> shortcut_icon_requests_;
   // Keeps information for running tasks.
   TaskIdToInfo task_id_to_info_;
 
   bool GetFakeIcon(mojom::ScaleFactor scale_factor,
                    std::string* png_data_as_string);
 
   DISALLOW_COPY_AND_ASSIGN(FakeAppInstance);
 };
 
 }  // namespace arc
 
 #endif  // COMPONENTS_ARC_TEST_FAKE_APP_INSTANCE_H_