Add TabControlFeature to BlimpClientContextImpl

blimp/client/core/contents/BUILD.gn

Index: blimp/client/core/contents/BUILD.gn
diff --git a/blimp/client/core/contents/BUILD.gn b/blimp/client/core/contents/BUILD.gn
index e5f57fb4b1afc98f990d3051fd9431e044378bb5..209da59f800d8ba883722f31d850f0c88490acf3 100644
--- a/blimp/client/core/contents/BUILD.gn
+++ b/blimp/client/core/contents/BUILD.gn
@@ -37,8 +37,6 @@ source_set("contents") {
 
   if (is_android) {
     sources += [
-      "android/blimp_contents_factory.cc",
-      "android/blimp_contents_factory.h",
       "android/blimp_contents_impl_android.cc",
       "android/blimp_contents_impl_android.h",
       "android/blimp_contents_jni_registrar.cc",
@@ -97,6 +95,8 @@ source_set("unit_tests") {
     "//blimp/net:test_support",
     "//net:test_support",
     "//testing/gtest",
+    "//ui/gfx:test_support",
+    "//ui/gfx/geometry",
     "//url",
   ]
 }
@@ -106,7 +106,6 @@ if (is_android) {
     visibility = [ "//blimp/client/*" ]
 
     java_files = [
-      "android/java/src/org/chromium/blimp/core/contents/BlimpContentsFactory.java",
       "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",
@@ -122,7 +121,6 @@ if (is_android) {
     visibility = [ ":*" ]
 
     sources = [
-      "android/java/src/org/chromium/blimp/core/contents/BlimpContentsFactory.java",
       "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",