| Index: net/net.gyp
|
| diff --git a/net/net.gyp b/net/net.gyp
|
| index f15dbcde625a8ea939d0c0776a4f26e15b792d5c..1a24281a75e505264e5b2057d3707b3efb273131 100644
|
| --- a/net/net.gyp
|
| +++ b/net/net.gyp
|
| @@ -1,4 +1,4 @@
|
| -# 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.
|
|
|
| @@ -1840,6 +1840,7 @@
|
| 'dependencies': [
|
| '../base/base.gyp:base',
|
| '../base/base.gyp:test_support_base',
|
| + '../build/temp_gyp/googleurl.gyp:googleurl',
|
| '../testing/gtest.gyp:gtest',
|
| 'net',
|
| ],
|
| @@ -1891,8 +1892,6 @@
|
| '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',
|
| @@ -1913,11 +1912,8 @@
|
| ['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',
|
| ],
|
| }],
|
| @@ -2198,9 +2194,8 @@
|
| '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': [
|
|
|