[sync] Divorce python sync test server chromiumsync.py from testserver.py

net/net.gyp

-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# Copyright 2013 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,
 
     'linux_link_kerberos%': 0,
     'conditions': [
       ['chromeos==1 or OS=="android" or OS=="ios"', {
@@ skipping 1826 matching lines @@
           },
         ],
       ],
     },
     {
       'target_name': 'net_test_support',
       'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:test_support_base',
+        '../build/temp_gyp/googleurl.gyp:googleurl',
         '../testing/gtest.gyp:gtest',
         'net',
       ],
       'export_dependent_settings': [
         '../base/base.gyp:base',
         '../base/base.gyp:test_support_base',
         '../testing/gtest.gyp:gtest',
       ],
       'sources': [
         'base/capturing_net_log.cc',
@@ skipping 31 matching lines @@
         'proxy/mock_proxy_resolver.cc',
         'proxy/mock_proxy_resolver.h',
         'proxy/mock_proxy_script_fetcher.cc',
         'proxy/mock_proxy_script_fetcher.h',
         'proxy/proxy_config_service_common_unittest.cc',
         'proxy/proxy_config_service_common_unittest.h',
         'socket/socket_test_util.cc',
         'socket/socket_test_util.h',
         'test/base_test_server.cc',
         'test/base_test_server.h',
-        'test/local_sync_test_server.cc',
-        'test/local_sync_test_server.h',
         'test/local_test_server_posix.cc',
         'test/local_test_server_win.cc',
         'test/local_test_server.cc',
         'test/local_test_server.h',
         'test/python_utils.cc',
         'test/python_utils.h',
         'test/remote_test_server.cc',
         'test/remote_test_server.h',
         'test/spawner_communicator.cc',
         'test/spawner_communicator.h',
         'test/test_server.h',
         'url_request/test_url_fetcher_factory.cc',
         'url_request/test_url_fetcher_factory.h',
         'url_request/url_request_test_util.cc',
         'url_request/url_request_test_util.h',
       ],
       'conditions': [
         ['inside_chromium_build==1 and OS != "ios"', {
           'dependencies': [
             # The test server uses Python modules generated by cloud print.
-            # TODO(sync): Remove this hack (http://crbug.com/119403).
+            # TODO(cloud_policy): Remove this hack (http://crbug.com/119403).
             '../chrome/app/policy/cloud_policy_codegen.gyp:cloud_policy_proto_compile',
-            # The test server uses Python modules generated by the sync protos.
-            # TODO(sync): Remove this hack (http://crbug.com/117559).
-            '../sync/protocol/sync_proto.gyp:sync_proto',
             '../third_party/protobuf/protobuf.gyp:py_proto',
           ],
         }],
         ['os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', {
           'conditions': [
             ['use_openssl==1', {
               'dependencies': [
                 '../third_party/openssl/openssl.gyp:openssl',
               ],
             }, {
@@ skipping 260 matching lines @@
           ],
           'sources': [
             'tools/net_watcher/net_watcher.cc',
           ],
         },
         {
           'target_name': 'run_testserver',
           'type': 'executable',
           'dependencies': [
             '../base/base.gyp:base',
-            '../build/temp_gyp/googleurl.gyp:googleurl',
+            '../base/base.gyp:test_support_base',
             '../testing/gtest.gyp:gtest',
-            'net',
             'net_test_support',
           ],
           'sources': [
             'tools/testserver/run_testserver.cc',
           ],
         },
         {
           'target_name': 'stress_cache',
           'type': 'executable',
           'dependencies': [
@@ skipping 221 matching lines @@
                 '--result', '<@(_outputs)',
                 '--isolate', 'net_unittests.isolate',
               ],
             },
           ],
         },
       ],
     }],
   ],
 }