Merge arc/common/settings.mojom into intent_helper.mojom

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")
 
 static_library("arc") {
   sources = [
     "arc_bridge_bootstrap.cc",
     "arc_bridge_bootstrap.h",
@@ skipping 10 matching lines @@
     "ime/arc_ime_bridge.h",
     "ime/arc_ime_ipc_host.cc",
     "ime/arc_ime_ipc_host.h",
     "input/arc_input_bridge.h",
     "input/arc_input_bridge_impl.cc",
     "input/arc_input_bridge_impl.h",
     "intent_helper/arc_intent_helper_bridge.cc",
     "intent_helper/arc_intent_helper_bridge.h",
     "power/arc_power_bridge.cc",
     "power/arc_power_bridge.h",
-    "settings/arc_settings_bridge.cc",
-    "settings/arc_settings_bridge.h",
     "video/arc_video_bridge.cc",
     "video/arc_video_bridge.h",
     "video/video_host_delegate.h",
   ]
 
   deps = [
     "//base",
     "//base:prefs",
     "//chromeos",
     "//chromeos:power_manager_proto",
@@ skipping 19 matching lines @@
     "common/app.mojom",
     "common/arc_bridge.mojom",
     "common/auth.mojom",
     "common/clipboard.mojom",
     "common/ime.mojom",
     "common/input.mojom",
     "common/intent_helper.mojom",
     "common/notifications.mojom",
     "common/power.mojom",
     "common/process.mojom",
-    "common/settings.mojom",
     "common/video.mojom",
   ]
 }
 
 static_library("arc_test_support") {
   testonly = true
   sources = [
     "test/fake_app_instance.cc",
     "test/fake_app_instance.h",
     "test/fake_arc_bridge_instance.cc",
@@ skipping 24 matching lines @@
     "//chromeos",
     "//ipc/mojo:mojo",
     "//mojo/public/cpp/environment:environment",
     "//mojo/public/cpp/system:system",
     "//testing/gtest",
     "//ui/aura",
     "//ui/events",
     "//ui/events:dom_keycode_converter",
   ]
 }