Expose Blimp dependencies to the embedder

blimp/client/BUILD.gn

Index: blimp/client/BUILD.gn
diff --git a/blimp/client/BUILD.gn b/blimp/client/BUILD.gn
index 21dec66609ce2cad39c0b3d8d68a7919f293652c..07d030e1e9e9f524599281f9a761c806909d2b41 100644
--- a/blimp/client/BUILD.gn
+++ b/blimp/client/BUILD.gn
@@ -50,6 +50,7 @@ source_set("client") {
     ":session",
     "//blimp/client/core:switches",
     "//blimp/client/core/compositor",
+    "//blimp/client/support",
     "//cc",
     "//cc/surfaces",
     "//components/safe_json",
@@ -60,9 +61,10 @@ source_set("client") {
   ]
 
   deps = [
-    ":compositor_support",
     "//base",
     "//blimp/client/core",
+    "//blimp/client/public:public_headers",
+    "//blimp/client/support",
     "//blimp/common",
     "//blimp/common/proto",
     "//blimp/net",
@@ -125,6 +127,8 @@ 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",
@@ -133,34 +137,14 @@ source_set("test_support") {
 
   deps = [
     ":session",
+    "//blimp/client/support",
+    "//cc:test_support",
     "//skia",
     "//testing/gmock",
     "//url",
   ]
 }
 
-# TODO(khushalsagar): Move these files to app/compositor.
-source_set("compositor_support") {
-  sources = [
-    "feature/compositor/blimp_context_provider.cc",
-    "feature/compositor/blimp_context_provider.h",
-    "feature/compositor/blimp_gpu_memory_buffer_manager.cc",
-    "feature/compositor/blimp_gpu_memory_buffer_manager.h",
-  ]
-
-  deps = [
-    "//cc",
-    "//gpu/command_buffer/client",
-    "//gpu/command_buffer/client:gl_in_process_context",
-    "//gpu/command_buffer/client:gles2_c_lib",
-    "//gpu/command_buffer/client:gles2_implementation",
-    "//gpu/command_buffer/common:gles2_utils",
-    "//gpu/skia_bindings",
-    "//skia",
-    "//ui/gl",
-  ]
-}
-
 source_set("compositor") {
   sources = [
     "feature/compositor/blimp_compositor.cc",
@@ -171,19 +155,17 @@ source_set("compositor") {
     "feature/compositor/blimp_input_handler_wrapper.h",
     "feature/compositor/blimp_input_manager.cc",
     "feature/compositor/blimp_input_manager.h",
-    "feature/compositor/blimp_layer_tree_settings.cc",
-    "feature/compositor/blimp_layer_tree_settings.h",
   ]
 
   deps = [
-    ":compositor_support",
-    "//blimp/client/core/compositor",
     "//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",
@@ -213,11 +195,11 @@ source_set("feature_unit_tests") {
 
   deps = [
     ":compositor",
-    ":compositor_support",
     ":test_support",
     "//base",
     "//base/test:test_support",
     "//blimp/client/core/compositor",
+    "//blimp/client/support",
     "//blimp/common",
     "//blimp/common/proto",
     "//blimp/net",
@@ -452,8 +434,6 @@ if (is_android) {
       "app/android/blimp_app_jni_registrar.h",
       "app/android/blimp_client_session_android.cc",
       "app/android/blimp_client_session_android.h",
-      "app/android/blimp_compositor_manager_android.cc",
-      "app/android/blimp_compositor_manager_android.h",
       "app/android/blimp_library_loader.cc",
       "app/android/blimp_library_loader.h",
       "app/android/blimp_view.cc",