summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-10 01:06:41 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-10 01:06:41 +0000
commit1bcf30ec84f19d40cc5c3f6051d0bb5860bfc74a (patch)
treea1c5b036a8aad3554aaca8947c3a249a8d5945e3 /net
parent70180a806fe954878cdca606620da7a153a9efe7 (diff)
downloadchromium_src-1bcf30ec84f19d40cc5c3f6051d0bb5860bfc74a.zip
chromium_src-1bcf30ec84f19d40cc5c3f6051d0bb5860bfc74a.tar.gz
chromium_src-1bcf30ec84f19d40cc5c3f6051d0bb5860bfc74a.tar.bz2
[Sync] Create new top-level sync/ directory
Move sync .proto files to sync/protocol. Update all references. This begins the Great Sync Migration. BUG=117585,43624 TEST= Review URL: https://chromiumcodereview.appspot.com/9668028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125967 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/net.gyp2
-rw-r--r--net/test/test_server.cc5
2 files changed, 2 insertions, 5 deletions
diff --git a/net/net.gyp b/net/net.gyp
index 850a522..e791245 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -1545,7 +1545,7 @@
'dependencies': [
'../chrome/app/policy/cloud_policy_codegen.gyp:cloud_policy_proto_compile',
# The test server uses Python modules generated by the sync protos.
- '../chrome/browser/sync/protocol/sync_proto.gyp:sync_proto',
+ '../sync/protocol/sync_proto.gyp:sync_proto',
'../third_party/protobuf/protobuf.gyp:py_proto',
],
}],
diff --git a/net/test/test_server.cc b/net/test/test_server.cc
index 397b0bc..4aee7d6 100644
--- a/net/test/test_server.cc
+++ b/net/test/test_server.cc
@@ -315,10 +315,7 @@ bool TestServer::SetPythonPath() {
}
AppendToPythonPath(pyproto_dir);
- AppendToPythonPath(pyproto_dir.AppendASCII("chrome")
- .AppendASCII("browser")
- .AppendASCII("sync")
- .AppendASCII("protocol"));
+ AppendToPythonPath(pyproto_dir.AppendASCII("sync").AppendASCII("protocol"));
AppendToPythonPath(pyproto_dir.AppendASCII("chrome")
.AppendASCII("browser")
.AppendASCII("policy")