Migrate TabControlFeature from 0.5 to 0.6

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")
 }
@@ skipping 73 matching lines @@
     ":client",
     "//base",
     "//base/test:test_support",
     "//testing/gmock",
     "//testing/gtest",
   ]
 }
 
 source_set("feature") {
   sources = [
+    "core/contents/tab_control_feature.cc",
+    "core/contents/tab_control_feature.h",
     "feature/ime_feature.cc",
     "feature/ime_feature.h",
     "feature/render_widget_feature.cc",
     "feature/render_widget_feature.h",
     "feature/settings_feature.cc",
     "feature/settings_feature.h",
-    "feature/tab_control_feature.cc",
-    "feature/tab_control_feature.h",
   ]
 
   deps = [
     "//base:base",
     "//blimp/common",
     "//blimp/net",
     "//cc",
     "//cc/proto",
     "//components/url_formatter",
     "//net:net",
@@ skipping 74 matching lines @@
     ":feature",
     "//blimp/common/proto",
     "//skia",
   ]
 }
 
 source_set("feature_unit_tests") {
   testonly = true
 
   sources = [
+    "core/contents/tab_control_feature_unittest.cc",
     "feature/compositor/blimp_compositor_manager_unittest.cc",
     "feature/render_widget_feature_unittest.cc",
-    "feature/tab_control_feature_unittest.cc",
   ]
 
   deps = [
     ":compositor",
     ":test_support",
     "//base",
     "//base/test:test_support",
     "//blimp/client/core/compositor",
     "//blimp/common",
     "//blimp/common/proto",
@@ skipping 271 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",
     ]
   }
 }