| Index: chrome/test/live_sync/live_sync_test.cc
|
| diff --git a/chrome/test/live_sync/live_sync_test.cc b/chrome/test/live_sync/live_sync_test.cc
|
| index 59b1e5d1d583a45241619c8b61fedda588455a4d..d2d8b16bf8bd0d67b175d3c5f9ebb58b772e496b 100644
|
| --- a/chrome/test/live_sync/live_sync_test.cc
|
| +++ b/chrome/test/live_sync/live_sync_test.cc
|
| @@ -22,7 +22,7 @@ void LiveSyncTest::SetUp() {
|
| // At this point, the browser hasn't been launched, and no services are
|
| // available. But we can verify our command line parameters and fail
|
| // early.
|
| - const CommandLine* cl = CommandLine::ForCurrentProcess();
|
| + CommandLine* cl = CommandLine::ForCurrentProcess();
|
| if (cl->HasSwitch(switches::kPasswordFileForTest)) {
|
| // Read GAIA credentials from a local password file if specified via the
|
| // "--password-file-for-test" command line switch. Note: The password file
|
| @@ -55,6 +55,13 @@ void LiveSyncTest::SetUp() {
|
| << "without specifying --" << switches::kSyncPasswordForTest;
|
| }
|
|
|
| + // TODO(rsimha): Until we implement a fake Tango server against which tests
|
| + // can run, we need to set the --sync-notification-method to "transitional".
|
| + if (!cl->HasSwitch(switches::kSyncNotificationMethod)) {
|
| + cl->AppendSwitchWithValue(switches::kSyncNotificationMethod,
|
| + "transitional");
|
| + }
|
| +
|
| // Unless a sync server was explicitly provided, run a test one locally.
|
| // TODO(ncarter): It might be better to allow the user to specify a choice
|
| // of sync server "providers" -- a script that could locate (or allocate)
|
|
|