Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(773)

Unified Diff: components/sync/test/local_sync_test_server.cc

Issue 2130453004: [Sync] Move //sync to //components/sync. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/sync/test/local_sync_test_server.h ('k') | components/sync/test/mock_invalidation.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/sync/test/local_sync_test_server.cc
diff --git a/sync/test/local_sync_test_server.cc b/components/sync/test/local_sync_test_server.cc
similarity index 81%
rename from sync/test/local_sync_test_server.cc
rename to components/sync/test/local_sync_test_server.cc
index 773555580b940e99c9da3df6c911d3900fcd3e6a..4dd1bfd09a9c63a7439ea9b362c60200eedc87df 100644
--- a/sync/test/local_sync_test_server.cc
+++ b/components/sync/test/local_sync_test_server.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sync/test/local_sync_test_server.h"
+#include "components/sync/test/local_sync_test_server.h"
#include <stdint.h>
@@ -19,9 +19,9 @@ namespace syncer {
LocalSyncTestServer::LocalSyncTestServer()
: LocalTestServer(
- net::SpawnedTestServer::TYPE_HTTP, // Sync uses the HTTP scheme.
- net::SpawnedTestServer::kLocalhost,
- base::FilePath()),
+ net::SpawnedTestServer::TYPE_HTTP, // Sync uses the HTTP scheme.
+ net::SpawnedTestServer::kLocalhost,
+ base::FilePath()),
xmpp_port_(0) {}
LocalSyncTestServer::LocalSyncTestServer(uint16_t port, uint16_t xmpp_port)
@@ -53,9 +53,10 @@ bool LocalSyncTestServer::GetTestServerPath(
LOG(ERROR) << "Failed to get DIR_SOURCE_ROOT";
return false;
}
- testserver_dir = testserver_dir.Append(FILE_PATH_LITERAL("sync"))
- .Append(FILE_PATH_LITERAL("tools"))
- .Append(FILE_PATH_LITERAL("testserver"));
+ testserver_dir = testserver_dir.Append(FILE_PATH_LITERAL("components"))
+ .Append(FILE_PATH_LITERAL("sync"))
+ .Append(FILE_PATH_LITERAL("tools"))
+ .Append(FILE_PATH_LITERAL("testserver"));
*testserver_path =
testserver_dir.Append(FILE_PATH_LITERAL("sync_testserver.py"));
@@ -92,7 +93,9 @@ bool LocalSyncTestServer::SetPythonPath() const {
<< "Testserver features that rely on it will not work";
return true;
}
- AppendToPythonPath(pyproto_dir.AppendASCII("sync").AppendASCII("protocol"));
+ AppendToPythonPath(pyproto_dir.AppendASCII("components")
+ .AppendASCII("sync")
+ .AppendASCII("protocol"));
return true;
}
« no previous file with comments | « components/sync/test/local_sync_test_server.h ('k') | components/sync/test/mock_invalidation.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698