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

Unified Diff: chrome/browser/sync/test/integration/sync_test.cc

Issue 271693004: Change multi-client Sync tests to use FakeServer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 7 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/test/integration/sync_test.cc
diff --git a/chrome/browser/sync/test/integration/sync_test.cc b/chrome/browser/sync/test/integration/sync_test.cc
index 91adcf69cc9ec8aea344f467457e28cf74f14788..4854da7db246451f9fd1232b7893c3f529e671eb 100644
--- a/chrome/browser/sync/test/integration/sync_test.cc
+++ b/chrome/browser/sync/test/integration/sync_test.cc
@@ -594,8 +594,15 @@ void SyncTest::DecideServerType() {
// one that makes sense for most developers. FakeServer is the
// current solution but some scenarios are only supported by the
// legacy python server.
- server_type_ = test_type_ == SINGLE_CLIENT || test_type_ == TWO_CLIENT ?
- IN_PROCESS_FAKE_SERVER : LOCAL_PYTHON_SERVER;
+ switch (test_type_) {
+ case SINGLE_CLIENT:
+ case TWO_CLIENT:
+ case MULTIPLE_CLIENT:
+ server_type_ = IN_PROCESS_FAKE_SERVER;
+ break;
+ default:
+ server_type_ = LOCAL_PYTHON_SERVER;
+ }
} else if (cl->HasSwitch(switches::kSyncServiceURL) &&
cl->HasSwitch(switches::kSyncServerCommandLine)) {
// If a sync server URL and a sync server command line are provided,
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698