summaryrefslogtreecommitdiffstats
path: root/net/test
diff options
context:
space:
mode:
authorkushi.p@gmail.com <kushi.p@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-08 01:07:38 +0000
committerkushi.p@gmail.com <kushi.p@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-08 01:07:38 +0000
commitf3a82601ba89c89aefb848400d6922fa6789d59a (patch)
tree08837df9b8badb10d3c79f6fdb76d2aa9a332bb4 /net/test
parenta63242c9bed08c287a88df99e12de7e49840a587 (diff)
downloadchromium_src-f3a82601ba89c89aefb848400d6922fa6789d59a.zip
chromium_src-f3a82601ba89c89aefb848400d6922fa6789d59a.tar.gz
chromium_src-f3a82601ba89c89aefb848400d6922fa6789d59a.tar.bz2
Remove hand-rolled cases of protobufs generations/compilation
using src/build/protoc.gypi to offer consistency between the other compilation steps, as well as ensuring that important variables (such as hard_dependency) are always properly set. Contination of work from: http://codereview.chromium.org/9148084/ Review URL: http://codereview.chromium.org/9315035 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120888 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/test')
-rw-r--r--net/test/test_server.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/net/test/test_server.cc b/net/test/test_server.cc
index 07575a26..329f994 100644
--- a/net/test/test_server.cc
+++ b/net/test/test_server.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
@@ -318,7 +318,10 @@ bool TestServer::SetPythonPath() {
.AppendASCII("browser")
.AppendASCII("sync")
.AppendASCII("protocol"));
- AppendToPythonPath(pyproto_dir.AppendASCII("device_management_pb"));
+ AppendToPythonPath(pyproto_dir.AppendASCII("chrome")
+ .AppendASCII("browser")
+ .AppendASCII("policy")
+ .AppendASCII("proto"));
return true;
}