blimp: Move BlimpCompositor to use delegated rendering.

blimp/client/BUILD.gn

Index: blimp/client/BUILD.gn
diff --git a/blimp/client/BUILD.gn b/blimp/client/BUILD.gn
index 2bf2c86ff4a4deffcc971c5eeb9e53b3e564321a..21dec66609ce2cad39c0b3d8d68a7919f293652c 100644
--- a/blimp/client/BUILD.gn
+++ b/blimp/client/BUILD.gn
@@ -42,20 +42,25 @@ source_set("client") {
     "app/blimp_discardable_memory_allocator.h",
     "app/blimp_startup.cc",
     "app/blimp_startup.h",
+    "app/compositor/browser_compositor.cc",
+    "app/compositor/browser_compositor.h",
   ]
 
   public_deps = [
     ":session",
     "//blimp/client/core:switches",
     "//blimp/client/core/compositor",
+    "//cc",
+    "//cc/surfaces",
     "//components/safe_json",
     "//components/url_formatter",
     "//skia",
     "//ui/events",
+    "//ui/gfx/geometry",
   ]
 
   deps = [
-    ":compositor",
+    ":compositor_support",
     "//base",
     "//blimp/client/core",
     "//blimp/common",
@@ -134,49 +139,59 @@ source_set("test_support") {
   ]
 }
 
+# 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",
     "feature/compositor/blimp_compositor.h",
     "feature/compositor/blimp_compositor_manager.cc",
     "feature/compositor/blimp_compositor_manager.h",
-    "feature/compositor/blimp_context_provider.cc",
-    "feature/compositor/blimp_context_provider.h",
-    "feature/compositor/blimp_delegating_output_surface.cc",
-    "feature/compositor/blimp_delegating_output_surface.h",
-    "feature/compositor/blimp_gpu_memory_buffer_manager.cc",
-    "feature/compositor/blimp_gpu_memory_buffer_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",
     "feature/compositor/blimp_layer_tree_settings.cc",
     "feature/compositor/blimp_layer_tree_settings.h",
-    "feature/compositor/blimp_output_surface.cc",
-    "feature/compositor/blimp_output_surface.h",
   ]
 
   deps = [
+    ":compositor_support",
+    "//blimp/client/core/compositor",
     "//blimp/client/core/compositor",
     "//blimp/common",
     "//blimp/net",
     "//cc",
     "//cc/proto",
     "//cc/surfaces",
-    "//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",
     "//net",
-    "//skia",
     "//third_party/WebKit/public:blink_headers",
     "//third_party/libwebp",
     "//ui/events:gesture_detection",
     "//ui/events/blink",
     "//ui/events/gestures/blink",
-    "//ui/gl",
+    "//ui/gfx/geometry:geometry",
+    "//ui/gl:gl",
   ]
 
   public_deps = [
@@ -192,11 +207,13 @@ source_set("feature_unit_tests") {
   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",
+    ":compositor_support",
     ":test_support",
     "//base",
     "//base/test:test_support",
@@ -207,6 +224,7 @@ source_set("feature_unit_tests") {
     "//blimp/net:test_support",
     "//blimp/test:support",
     "//cc/proto",
+    "//cc/surfaces:surfaces",
     "//net",
     "//net:test_support",
     "//skia",
@@ -215,11 +233,6 @@ source_set("feature_unit_tests") {
     "//ui/events:gesture_detection",
     "//ui/gfx/geometry",
   ]
-
-  if (is_linux) {
-    #TODO(khushalsagar): Run these tests for android.
-    sources += [ "feature/compositor/blimp_compositor_unittest.cc" ]
-  }
 }
 
 if (is_linux && !is_chromeos && use_x11) {
@@ -234,6 +247,7 @@ if (is_linux && !is_chromeos && use_x11) {
 
     deps = [
       ":client",
+      ":compositor",
       "//base",
       "//blimp/client:compositor",
       "//blimp/client/core/session",