Revert of Reland "arc-bridge: Move most methods to Mojo interfaces"

chrome/browser/ui/app_list/arc/arc_app_item.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 "chrome/browser/ui/app_list/arc/arc_app_item.h"
 
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"
 #include "components/arc/arc_bridge_service.h"
 #include "content/public/browser/browser_thread.h"
@@ skipping 41 matching lines @@
   }
 
   ArcAppListPrefs* prefs = ArcAppListPrefs::Get(profile());
   scoped_ptr<ArcAppListPrefs::AppInfo> app_info = prefs->GetApp(id());
   if (!app_info) {
     VLOG(2) << "Cannot launch unavailable app:" << id() << ".";
     return;
   }
 
   arc::ArcBridgeService* bridge_service = arc::ArcBridgeService::Get();
-  if (!bridge_service) {
-    VLOG(2) << "Request to launch app when bridge service is not ready: "
-            << id() << ".";
-    return;
-  }
-  arc::AppInstance* app_instance = bridge_service->app_instance();
-  if (!app_instance) {
-    VLOG(2) << "Request to launch app when bridge service is not ready: "
-            << id() << ".";
+  if (!bridge_service ||
+      bridge_service->state() != arc::ArcBridgeService::State::READY) {
+    VLOG(2) << "Cannot launch app: " << app_info->package
+            << ". Bridge service is not ready.";
     return;
   }
 
-  app_instance->LaunchApp(app_info->package, app_info->activity);
+  bridge_service->LaunchApp(app_info->package, app_info->activity);
 }
 
 void ArcAppItem::SetReady(bool ready) {
   if (ready_ == ready)
     return;
 
   ready_ = ready;
   UpdateIcon();
 }
 
@@ skipping 20 matching lines @@
       GetAppSorting()->GetNaturalAppPageOrdinal();
   // And get next available pos in this page.
   const syncer::StringOrdinal& pos =
      GetAppSorting()->CreateNextAppLaunchOrdinal(page);
   set_position(pos);
 }
 
 void ArcAppItem::OnIconUpdated() {
   UpdateIcon();
 }