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

cc/cc.gyp

 # Copyright (c) 2012 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'targets': [
     {
@@ skipping 546 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/thread_proxy.cc',
+        'trees/thread_proxy.h',
         'trees/task_runner_provider.cc',
         'trees/task_runner_provider.h',
         'trees/threaded_channel.cc',
         'trees/threaded_channel.h',
         'trees/tree_synchronizer.cc',
         'trees/tree_synchronizer.h',
       ],
       'includes': [
         '../build/android/increase_size_for_speed.gypi',
       ],
@@ skipping 93 matching lines @@
         'surfaces/surface_resource_holder.cc',
         'surfaces/surface_resource_holder.h',
         'surfaces/surfaces_export.h',
       ],
       'includes': [
         '../build/android/increase_size_for_speed.gypi',
       ],
     },
   ],
 }