blimp: Move compositing, input and render widget feature to client/core.

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..0daf9ea73dbbe6a7d44799c0acadc239a9936660 100644
--- a/blimp/client/core/contents/BUILD.gn
+++ b/blimp/client/core/contents/BUILD.gn
@@ -31,14 +31,14 @@ source_set("contents") {
   ]
 
   deps = [
+    "//blimp/client/core/compositor:compositor_support",
+    "//blimp/client/core/render_widget",
     "//blimp/common",
     "//components/url_formatter",
   ]
 
   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",
@@ -92,11 +92,14 @@ source_set("unit_tests") {
     ":contents",
     ":test_support",
     "//base",
+    "//blimp/client/core/compositor:compositor_support",
+    "//blimp/client/core/render_widget",
     "//blimp/client/public:public_headers",
     "//blimp/common",
     "//blimp/net:test_support",
     "//net:test_support",
     "//testing/gtest",
+    "//third_party/WebKit/public:blink_headers",
     "//url",
   ]
 }
@@ -106,7 +109,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 +124,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",