Refactor ArcSessionRunner part 1.

components/arc/BUILD.gn

 # 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.
 
 import("//mojo/public/tools/bindings/mojom.gni")
 import("//testing/test.gni")
 
 static_library("arc") {
   sources = [
-    "arc_bridge_host_impl.cc",
-    "arc_bridge_host_impl.h",
-    "arc_bridge_service_impl.cc",
-    "arc_bridge_service_impl.h",
-    "arc_features.cc",
-    "arc_features.h",
     "arc_service_manager.cc",
     "arc_service_manager.h",
-    "arc_session.cc",
-    "arc_session.h",
     "audio/arc_audio_bridge.cc",
     "audio/arc_audio_bridge.h",
     "bluetooth/arc_bluetooth_bridge.cc",
     "bluetooth/arc_bluetooth_bridge.h",
     "bluetooth/bluetooth_struct_traits.cc",
     "bluetooth/bluetooth_struct_traits.h",
     "bluetooth/bluetooth_type_converters.cc",
     "bluetooth/bluetooth_type_converters.h",
     "boot_phase_monitor/arc_boot_phase_monitor_bridge.cc",
     "boot_phase_monitor/arc_boot_phase_monitor_bridge.h",
@@ skipping 46 matching lines @@
     "//ash:ash",
     "//ash/public/interfaces",
     "//base",
     "//chromeos",
     "//chromeos:power_manager_proto",
     "//components/exo",
     "//components/google/core/browser",
     "//components/onc",
     "//components/prefs",
     "//components/signin/core/account_id",
-    "//components/user_manager",
     "//device/bluetooth",
     "//google_apis",
     "//mojo/edk/system",

[Luis Héctor Chávez, 2016/12/16 23:31:00]

Can this be removed?

[hidehiko, 2016/12/19 08:27:03]

Unfortunately, we cannot.
Some other modules (crash_reporter, bluetooth) directly depends on mojo::edk
(specifically ScopedHandler etc), and if we do not have this here, gn reports an
error.

     "//skia",
     "//third_party/re2:re2",
     "//ui/aura",
     "//ui/base:base",
     "//ui/base/ime",
     "//ui/display/manager",
     "//ui/events",
     "//ui/events:dom_keycode_converter",
     "//ui/keyboard:keyboard",
     "//url:url",
   ]
 }
 
 static_library("arc_base") {
+  # TODO(hidehiko): Revisit here and move back some files to "arc"
+  # on completion to move ArcSession task to ArcSessionManager.
   sources = [
+    "arc_bridge_host_impl.cc",
+    "arc_bridge_host_impl.h",
     "arc_bridge_service.cc",
     "arc_bridge_service.h",
+    "arc_features.cc",
+    "arc_features.h",
     "arc_service.cc",
     "arc_service.h",
+    "arc_session.cc",
+    "arc_session.h",
     "arc_session_observer.cc",
     "arc_session_observer.h",
+    "arc_session_runner.cc",
+    "arc_session_runner.h",
     "instance_holder.h",
   ]
 
   deps = [
     "//base",
     "//chromeos",
+    "//components/user_manager",
+    "//mojo/edk/system",
   ]
 
   public_deps = [
     ":arc_bindings",
   ]
 }
 
 mojom("arc_bindings") {
   sources = [
     "common/app.mojom",
@@ skipping 31 matching lines @@
     "//mojo/common:common_custom_types",
     "//ui/gfx/geometry/mojo",
   ]
 }
 
 static_library("arc_test_support") {
   testonly = true
   sources = [
     "test/fake_app_instance.cc",
     "test/fake_app_instance.h",
-    "test/fake_arc_bridge_service.cc",
-    "test/fake_arc_bridge_service.h",
     "test/fake_arc_session.cc",
     "test/fake_arc_session.h",
     "test/fake_bluetooth_instance.cc",
     "test/fake_bluetooth_instance.h",
     "test/fake_file_system_instance.cc",
     "test/fake_file_system_instance.h",
     "test/fake_intent_helper_instance.cc",
     "test/fake_intent_helper_instance.h",
     "test/fake_notifications_instance.cc",
     "test/fake_notifications_instance.h",
     "test/fake_policy_instance.cc",
     "test/fake_policy_instance.h",
   ]
 
   public_deps = [
     ":arc",
   ]
 
   deps = [
     "//base",
     "//mojo/common:common_base",
   ]
 }
 
 source_set("unit_tests") {
   testonly = true
   sources = [
-    "arc_bridge_service_unittest.cc",
+    "arc_session_runner_unittest.cc",
     "bluetooth/arc_bluetooth_bridge_unittest.cc",
     "bluetooth/bluetooth_struct_traits_unittest.cc",
     "bluetooth/bluetooth_type_converters_unittest.cc",
     "ime/arc_ime_service_unittest.cc",
     "intent_helper/activity_icon_loader_unittest.cc",
     "intent_helper/arc_intent_helper_bridge_unittest.cc",
     "intent_helper/font_size_util_unittest.cc",
     "intent_helper/intent_filter_unittest.cc",
     "intent_helper/link_handler_model_impl_unittest.cc",
     "intent_helper/local_activity_resolver_unittest.cc",
     "intent_helper/page_transition_util_unittest.cc",
   ]
 
   deps = [
     ":arc_test_support",
     "//base",
     "//chromeos",
     "//device/bluetooth",
     "//mojo/public/cpp/system:system",
     "//testing/gtest",
     "//ui/aura",
     "//ui/aura:test_support",
     "//ui/base:test_support",
     "//ui/base/ime",
     "//ui/events",
     "//ui/events:dom_keycode_converter",
     "//url:url",
   ]
 }