Move remaining Blimp feature code to core.

blimp/client/core/BUILD.gn

 # 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.
 
 if (is_android) {
   import("//build/config/android/config.gni")
   import("//build/config/android/rules.gni")
 }
 
 import("//blimp/client/core/config.gni")
@@ skipping 20 matching lines @@
     "//blimp/client/*",
     "//blimp/test/*",
   ]
 
   deps = [
     ":context",
     ":switches",
     "//blimp/client/core/compositor",
     "//blimp/client/core/contents",
     "//blimp/client/core/geolocation",
+    "//blimp/client/core/render_widget",
     "//blimp/client/core/session",
+    "//blimp/client/core/settings",
   ]
 }
 
 source_set("dummy_core") {
   visibility = [ ":*" ]
 
   sources = [
     "dummy_blimp_client_context.cc",
     "dummy_blimp_client_context.h",
   ]
@@ skipping 17 matching lines @@
 
 source_set("unit_tests") {
   testonly = true
 
   sources = [
     "blimp_client_context_impl_unittest.cc",
   ]
 
   deps = [
     ":context",
-    "//blimp/client:feature",
     "//blimp/client/core/compositor:unit_tests",
     "//blimp/client/core/contents:unit_tests",
     "//blimp/client/core/geolocation:unit_tests",
+    "//blimp/client/core/render_widget:unit_tests",
     "//blimp/client/core/session:unit_tests",
     "//blimp/client/public:public_headers",
+    "//blimp/client/support:test_support",
     "//blimp/client/test",
     "//testing/gmock",
     "//testing/gtest",
   ]
 }
 
 source_set("context") {
   sources = [
     "blimp_client_context_impl.cc",
     "blimp_client_context_impl.h",
   ]
 
   public_deps = [
     "//base",
     "//blimp/client/core/contents",
     "//blimp/client/core/session",
     "//blimp/client/public:public_headers",
     "//url",
   ]
 
+  deps = [
+    ":switches",
+    "//blimp/client/core/settings",
+  ]
+
   if (is_android) {
     sources += [
       "android/blimp_client_context_impl_android.cc",
       "android/blimp_client_context_impl_android.h",
       "android/blimp_jni_registrar.cc",
     ]
 
-    deps = [
+    deps += [
       ":context_jni_headers",
       "//blimp/client/core/settings",
     ]
   }
 }
 
 source_set("switches") {
   visibility = [
     "//blimp/client/*",
     "//blimp/engine:browser_tests",
@@ skipping 95 matching lines @@
   generate_jni("dummy_core_jni_headers") {
     visibility = [ ":*" ]
 
     sources = [
       "android/java/src/org/chromium/blimp/core/DummyBlimpClientContext.java",
     ]
 
     jni_package = "blimp/client/core"
   }
 }