Revert of arc: Use the new InstanceHolder for unittests

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/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"
@@ skipping 92 matching lines @@
   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_);
 
   app_instance_.reset(new arc::FakeAppInstance(arc_app_list_pref_));
-  bridge_service_->app()->SetInstance(app_instance_.get());
+  arc::mojom::AppInstancePtr instance;
+  app_instance_->Bind(mojo::GetProxy(&instance));
+  bridge_service_->OnAppInstanceReady(std::move(instance));
+  app_instance_->WaitForOnAppInstanceReady();
 
   // Check initial conditions.
   EXPECT_EQ(bridge_service_.get(), arc::ArcBridgeService::Get());
   EXPECT_TRUE(!arc::ArcBridgeService::Get()->available());
   EXPECT_FALSE(arc::ArcBridgeService::Get()->ready());
 
   // At this point we should have ArcAppListPrefs as observer of service.
   EXPECT_TRUE(bridge_service_->HasObserver(arc_app_list_pref_));
   bridge_service()->SetReady();
 }
@@ skipping 24 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;
 }