Move remaining Blimp feature code to core.

blimp/client/core/contents/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")
 }
 
 source_set("contents") {
   visibility = [ "//blimp/client/*" ]
 
   sources = [
     "blimp_contents_impl.cc",
     "blimp_contents_impl.h",
     "blimp_contents_manager.cc",
     "blimp_contents_manager.h",
     "blimp_contents_view.h",
     "blimp_navigation_controller_delegate.h",
     "blimp_navigation_controller_impl.cc",
     "blimp_navigation_controller_impl.h",
     "ime_feature.cc",
     "ime_feature.h",
     "navigation_feature.cc",
     "navigation_feature.h",
+    "tab_control_feature.cc",
+    "tab_control_feature.h",
   ]
 
   public_deps = [
     "//base",
-    "//blimp/client:feature",
+    "//blimp/client/core/compositor",
     "//blimp/client/public:public_headers",
     "//blimp/net",
     "//net:net",
     "//ui/base/ime:text_input_types",
     "//ui/gfx/geometry:geometry",
     "//url",
   ]
 
   deps = [
+    "//blimp/client/core/render_widget",
     "//blimp/common",
     "//components/url_formatter",
     "//skia",
   ]
 
   if (is_android) {
     sources += [
       "android/blimp_contents_impl_android.cc",
       "android/blimp_contents_impl_android.h",
       "android/blimp_contents_jni_registrar.cc",
@@ skipping 31 matching lines @@
     "mock_navigation_feature_delegate.h",
   ]
 
   deps = [
     "//base",
     "//skia",
     "//url",
   ]
 
   public_deps = [
-    "//blimp/client/core/contents",
+    ":contents",
     "//testing/gmock",
   ]
 }
 
 source_set("unit_tests") {
   visibility = [ "//blimp/client/core:unit_tests" ]
 
   testonly = true
 
   sources = [
     "blimp_contents_impl_unittest.cc",
     "blimp_contents_manager_unittest.cc",
     "blimp_contents_observer_unittest.cc",
     "blimp_navigation_controller_impl_unittest.cc",
     "navigation_feature_unittest.cc",
+    "tab_control_feature_unittest.cc",
   ]
 
   deps = [
     ":contents",
     ":test_support",
     "//base",
-    "//blimp/client:feature",
     "//blimp/client/public:public_headers",
+    "//blimp/client/support:test_support",
     "//blimp/common",
     "//blimp/net:test_support",
+    "//net",
     "//net:test_support",
     "//testing/gtest",
     "//ui/gfx:test_support",
     "//ui/gfx/geometry:geometry",
     "//url",
   ]
 }
 
 if (is_android) {
   android_library("contents_java") {
@@ skipping 16 matching lines @@
 
     sources = [
       "android/java/src/org/chromium/blimp/core/contents/BlimpContentsImpl.java",
       "android/java/src/org/chromium/blimp/core/contents/BlimpContentsObserverProxy.java",
       "android/java/src/org/chromium/blimp/core/contents/BlimpNavigationControllerImpl.java",
     ]
 
     jni_package = "blimp/client/core/contents"
   }
 }