Move remaining Blimp feature code to core.

blimp/client/BUILD.gn

Index: blimp/client/BUILD.gn
diff --git a/blimp/client/BUILD.gn b/blimp/client/BUILD.gn
index b3323f8b69085264e50339c3faef5e8808668cf6..b14e565bf4e69eea5fb0b00d4dab25ba89a148c1 100644
--- a/blimp/client/BUILD.gn
+++ b/blimp/client/BUILD.gn
@@ -16,17 +16,19 @@ source_set("session") {
   ]
 
   public_deps = [
-    ":feature",
+    "//blimp/client/core",
     "//blimp/client/core:switches",
+    "//blimp/common/proto",
     "//ui/events",
   ]
 
   deps = [
-    ":compositor",
     "//base",
     "//blimp/client/core/compositor",
     "//blimp/client/core/contents",
+    "//blimp/client/core/render_widget",
     "//blimp/client/core/session",
+    "//blimp/client/core/settings",
     "//blimp/common",
     "//blimp/common/proto",
     "//blimp/net",
@@ -96,127 +98,20 @@ source_set("app_unit_tests") {
   ]
 }
 
-source_set("feature") {
-  sources = [
-    "core/contents/tab_control_feature.cc",
-    "core/contents/tab_control_feature.h",
-    "feature/render_widget_feature.cc",
-    "feature/render_widget_feature.h",
-    "feature/settings_feature.cc",
-    "feature/settings_feature.h",
-  ]
-
-  deps = [
-    "//base:base",
-    "//blimp/common",
-    "//blimp/net",
-    "//cc",
-    "//cc/proto",
-    "//components/url_formatter",
-    "//net:net",
-    "//skia",
-    "//ui/gfx/geometry:geometry",
-  ]
-
-  public_deps = [
-    "//blimp/common/proto",
-  ]
-}
-
 source_set("test_support") {
   testonly = true
 
   sources = [
-    "feature/compositor/mock_compositor_dependencies.cc",
-    "feature/compositor/mock_compositor_dependencies.h",
-    "feature/mock_render_widget_feature_delegate.cc",
-    "feature/mock_render_widget_feature_delegate.h",
     "session/test_client_session.cc",
     "session/test_client_session.h",
   ]
 
   deps = [
     ":session",
-    "//blimp/client/support",
-    "//cc:test_support",
-    "//skia",
-    "//testing/gmock",
     "//url",
   ]
 }
 
-source_set("compositor") {
-  sources = [
-    "feature/compositor/blimp_compositor.cc",
-    "feature/compositor/blimp_compositor.h",
-    "feature/compositor/blimp_compositor_manager.cc",
-    "feature/compositor/blimp_compositor_manager.h",
-    "feature/compositor/blimp_input_handler_wrapper.cc",
-    "feature/compositor/blimp_input_handler_wrapper.h",
-    "feature/compositor/blimp_input_manager.cc",
-    "feature/compositor/blimp_input_manager.h",
-  ]
-
-  deps = [
-    "//blimp/client/core/compositor",
-    "//blimp/client/public:public_headers",
-    "//blimp/common",
-    "//blimp/net",
-    "//cc",
-    "//cc/proto",
-    "//cc/surfaces",
-    "//gpu/command_buffer/client",
-    "//net",
-    "//third_party/WebKit/public:blink_headers",
-    "//third_party/libwebp",
-    "//ui/events:gesture_detection",
-    "//ui/events/blink",
-    "//ui/events/gestures/blink",
-    "//ui/gfx/geometry:geometry",
-    "//ui/gl:gl",
-  ]
-
-  public_deps = [
-    ":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/compositor/blimp_compositor_unittest.cc",
-    "feature/render_widget_feature_unittest.cc",
-  ]
-
-  deps = [
-    ":compositor",
-    ":test_support",
-    "//base",
-    "//base/test:test_support",
-    "//blimp/client/core/compositor",
-    "//blimp/client/support",
-    "//blimp/common",
-    "//blimp/common/proto",
-    "//blimp/net",
-    "//blimp/net:test_support",
-    "//blimp/test:support",
-    "//cc/proto",
-    "//cc/surfaces:surfaces",
-    "//net",
-    "//net:test_support",
-    "//skia",
-    "//testing/gmock",
-    "//testing/gtest",
-    "//ui/events:gesture_detection",
-    "//ui/gfx/geometry",
-  ]
-}
-
 if (is_linux && !is_chromeos && use_x11) {
   executable("blimp_shell") {
     sources = [
@@ -229,9 +124,8 @@ if (is_linux && !is_chromeos && use_x11) {
 
     deps = [
       ":client",
-      ":compositor",
       "//base",
-      "//blimp/client:compositor",
+      "//blimp/client/core/compositor",
       "//blimp/client/core/session",
       "//blimp/net",
       "//net",
@@ -417,10 +311,11 @@ if (is_android) {
       ":client",
       ":jni_headers",
       "//base",
-      "//blimp/client:compositor",
       "//blimp/client/core",
+      "//blimp/client/core/compositor",
       "//blimp/client/core/contents",
       "//blimp/client/core/session:session",
+      "//blimp/client/core/settings",
       "//blimp/client/public:public_headers",
       "//blimp/common",
       "//blimp/common/proto",