[NOT LANDED] Revert of cc: Split ThreadProxy into ProxyMain and ProxyImpl

cc/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//testing/test.gni")
 
 component("cc") {
   sources = [
     "animation/animation.cc",
     "animation/animation.h",
@@ skipping 484 matching lines @@
     "trees/occlusion.h",
     "trees/occlusion_tracker.cc",
     "trees/occlusion_tracker.h",
     "trees/property_tree.cc",
     "trees/property_tree.h",
     "trees/property_tree_builder.cc",
     "trees/property_tree_builder.h",
     "trees/proxy.h",
     "trees/proxy_common.cc",
     "trees/proxy_common.h",
-    "trees/proxy_impl.cc",
     "trees/proxy_impl.h",
-    "trees/proxy_main.cc",
     "trees/proxy_main.h",
     "trees/remote_proto_channel.h",
     "trees/scoped_abort_remaining_swap_promises.h",
     "trees/single_thread_proxy.cc",
     "trees/single_thread_proxy.h",
     "trees/swap_promise_monitor.cc",
     "trees/swap_promise_monitor.h",
     "trees/task_runner_provider.cc",
     "trees/task_runner_provider.h",
+    "trees/thread_proxy.cc",
+    "trees/thread_proxy.h",
     "trees/threaded_channel.cc",
     "trees/threaded_channel.h",
     "trees/tree_synchronizer.cc",
     "trees/tree_synchronizer.h",
   ]
 
   if (target_cpu == "x86" || target_cpu == "x64") {
     sources += [
       "raster/texture_compressor_etc1_sse.cc",
       "raster/texture_compressor_etc1_sse.h",
@@ skipping 121 matching lines @@
     "test/pixel_comparator.cc",
     "test/pixel_comparator.h",
     "test/pixel_test.cc",
     "test/pixel_test.h",
     "test/pixel_test_output_surface.cc",
     "test/pixel_test_output_surface.h",
     "test/pixel_test_software_output_device.cc",
     "test/pixel_test_software_output_device.h",
     "test/pixel_test_utils.cc",
     "test/pixel_test_utils.h",
-    "test/proxy_impl_for_test.cc",
-    "test/proxy_impl_for_test.h",
-    "test/proxy_main_for_test.cc",
-    "test/proxy_main_for_test.h",
     "test/render_pass_test_utils.cc",
     "test/render_pass_test_utils.h",
     "test/scheduler_test_common.cc",
     "test/scheduler_test_common.h",
     "test/skia_common.cc",
     "test/skia_common.h",
     "test/solid_color_content_layer_client.cc",
     "test/solid_color_content_layer_client.h",
     "test/surface_aggregator_test_helpers.cc",
     "test/surface_aggregator_test_helpers.h",
     "test/surface_hittest_test_helpers.cc",
     "test/surface_hittest_test_helpers.h",
     "test/task_graph_runner_test_template.cc",
     "test/task_graph_runner_test_template.h",
     "test/test_context_provider.cc",
     "test/test_context_provider.h",
     "test/test_context_support.cc",
     "test/test_context_support.h",
     "test/test_gles2_interface.cc",
     "test/test_gles2_interface.h",
     "test/test_gpu_memory_buffer_manager.cc",
     "test/test_gpu_memory_buffer_manager.h",
-    "test/test_hooks.cc",
-    "test/test_hooks.h",
     "test/test_image_factory.cc",
     "test/test_image_factory.h",
     "test/test_in_process_context_provider.cc",
     "test/test_in_process_context_provider.h",
     "test/test_occlusion_tracker.h",
     "test/test_shared_bitmap_manager.cc",
     "test/test_shared_bitmap_manager.h",
     "test/test_task_graph_runner.cc",
     "test/test_task_graph_runner.h",
     "test/test_texture.cc",
     "test/test_texture.h",
     "test/test_tile_priorities.cc",
     "test/test_tile_priorities.h",
     "test/test_web_graphics_context_3d.cc",
     "test/test_web_graphics_context_3d.h",
-    "test/threaded_channel_for_test.cc",
-    "test/threaded_channel_for_test.h",
   ]
 
   configs += [ "//build/config:precompiled_headers" ]
 
   public_deps = [
     ":cc",
     "//gpu:test_support",
   ]
   deps = [
     "//base",
@@ skipping 262 matching lines @@
     "//ui/gl",
     "//ui/gl:test_support",
   ]
 
   if (is_android) {
     isolate_file = "cc_perftests.isolate"
   }
 }
 # When adding support for isolates, please have a look at run-time dependencies
 # in the cc_unittests_run target in cc_tests.gyp.