Move blimp switches to core

blimp/client/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("//build/config/ui.gni")
 
 if (is_android) {
   import("//build/config/android/config.gni")
   import("//build/config/android/rules.gni")
 }
 
 source_set("session") {
   sources = [
     "session/assignment_source.cc",
     "session/assignment_source.h",
     "session/blimp_client_session.cc",
     "session/blimp_client_session.h",
   ]
 
   public_deps = [
     ":feature",
-    ":switches",
+    "//blimp/client/core:switches",
     "//components/safe_json",
     "//ui/events",
   ]
 
   deps = [
     ":compositor",
     "//base",
     "//blimp/common",
     "//blimp/common/proto",
     "//blimp/net",
     "//net",
     "//ui/gfx/geometry",
     "//url:url",
   ]
 }
 
 source_set("client") {
   sources = [
     "app/blimp_discardable_memory_allocator.cc",
     "app/blimp_discardable_memory_allocator.h",
     "app/blimp_startup.cc",
     "app/blimp_startup.h",
   ]
 
   public_deps = [
     ":session",
-    ":switches",
+    "//blimp/client/core:switches",
     "//components/safe_json",
     "//components/url_formatter",
     "//skia",
     "//ui/events",
   ]
 
   deps = [
     ":compositor",
     "//base",
     "//blimp/client/core",
     "//blimp/common",
     "//blimp/common/proto",
     "//blimp/net",
     "//cc",
     "//gpu/command_buffer/client:gles2_implementation",
     "//gpu/skia_bindings",
     "//net",
     "//third_party/libwebp",
     "//ui/gfx/geometry",
     "//ui/gl",
     "//ui/gl/init",
     "//url:url",
   ]
 }
 
-source_set("switches") {
-  sources = [
-    "app/blimp_client_switches.cc",
-    "app/blimp_client_switches.h",
-  ]
-}
-
 source_set("blimp_client_unit_tests") {
   testonly = true
 
   sources = []
 
   deps = [
     ":client",
     ":session",
-    ":switches",
     "//base",
     "//base/test:run_all_unittests",
     "//base/test:test_support",
+    "//blimp/client/core:switches",
     "//blimp/common",
     "//testing/gmock",
     "//testing/gtest",
   ]
 
   data = []
 
   # TODO(dtrainor): Fix the test harness to allow this to run on Android.
   # See crbug.com/588240.
   if (is_linux) {
@@ skipping 325 matching lines @@
       # notifications are used.
       "//ui/android:ui_java",
       google_play_services_library,
     ]
 
     java_files = [
       "app/android/java/src/org/chromium/blimp/auth/RetryingTokenSource.java",
       "app/android/java/src/org/chromium/blimp/auth/TokenSource.java",
       "app/android/java/src/org/chromium/blimp/auth/TokenSourceImpl.java",
       "app/android/java/src/org/chromium/blimp/BlimpApplication.java",
-      "app/android/java/src/org/chromium/blimp/BlimpClientSwitches.java",
       "app/android/java/src/org/chromium/blimp/BlimpLibraryLoader.java",
       "app/android/java/src/org/chromium/blimp/BlimpRendererActivity.java",
       "app/android/java/src/org/chromium/blimp/BlimpView.java",
       "app/android/java/src/org/chromium/blimp/BrowserRestartActivity.java",
       "app/android/java/src/org/chromium/blimp/input/WebInputBox.java",
       "app/android/java/src/org/chromium/blimp/preferences/PreferencesUtil.java",
       "app/android/java/src/org/chromium/blimp/session/BlimpClientSession.java",
       "app/android/java/src/org/chromium/blimp/session/EngineInfo.java",
       "app/android/java/src/org/chromium/blimp/session/TabControlFeature.java",
       "app/android/java/src/org/chromium/blimp/settings/AboutBlimpPreferences.java",
@@ skipping 87 matching lines @@
   instrumentation_test_apk("blimp_test_apk") {
     apk_name = "BlimpTest"
     apk_under_test = ":blimp_apk"
     android_manifest = blimp_test_apk_manifest
     android_manifest_dep = ":blimp_test_apk_manifest"
     deps = [
       ":blimp_test_java",
     ]
   }
 }