arc: Revamp the ArcBridgeService interface

chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.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/ash/launcher/arc_app_window_launcher_controller.h"
 
+#include <string>
+
 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm_shell.h"
 #include "ash/display/screen_orientation_controller_chromeos.h"
 #include "ash/shelf/shelf_delegate.h"
 #include "ash/shelf/shelf_util.h"
 #include "ash/shell.h"
 #include "ash/wm/window_state_aura.h"
 #include "ash/wm/window_util.h"
 #include "base/bind.h"
@@ skipping 165 matching lines @@
   }
 
   bool has_requested_orientation_lock() const {
     return has_requested_orientation_lock_;
   }
 
  private:
   arc::mojom::AppInstance* GetAppInstance() {
     arc::ArcBridgeService* bridge_service = arc::ArcBridgeService::Get();
     arc::mojom::AppInstance* app_instance =
-        bridge_service ? bridge_service->app_instance() : nullptr;
+        bridge_service ? bridge_service->app()->instance() : nullptr;
     if (!app_instance) {
       VLOG(2) << "Arc Bridge is not available.";
       return nullptr;
     }
 
-    if (bridge_service->app_version() < 3) {
+    if (bridge_service->app()->version() < 3) {
       VLOG(2) << "Arc Bridge has old version for apps."
-              << bridge_service->app_version();
+              << bridge_service->app()->version();
       return nullptr;
     }
     return app_instance;
   }
 
   int task_id_;
   ash::ShelfID shelf_id_ = 0;
   std::string app_id_;
   FullScreenMode fullscreen_mode_ = FullScreenMode::NOT_DEFINED;
   // Unowned pointers
@@ skipping 358 matching lines @@
     ArcAppListPrefs* prefs = ArcAppListPrefs::Get(observed_profile_);
     std::unique_ptr<ArcAppListPrefs::AppInfo> app_info =
         prefs->GetApp(app_window->app_id());
     if (!app_info)
       return;
     orientation_lock = app_info->orientation_lock;
   }
   shell->screen_orientation_controller()->LockOrientationForWindow(
       window, BlinkOrientationLockFromMojom(orientation_lock));
 }