Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/test/live_sync/live_sync_test.h" | 5 #include "chrome/test/live_sync/live_sync_test.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 171 cl->AppendSwitchASCII(switches::kSyncNotificationMethod, "p2p"); | 171 cl->AppendSwitchASCII(switches::kSyncNotificationMethod, "p2p"); |
| 172 | 172 |
| 173 // TODO(sync): Remove this once sessions sync is enabled by default. | 173 // TODO(sync): Remove this once sessions sync is enabled by default. |
| 174 if (!cl->HasSwitch(switches::kEnableSyncSessions)) | 174 if (!cl->HasSwitch(switches::kEnableSyncSessions)) |
| 175 cl->AppendSwitch(switches::kEnableSyncSessions); | 175 cl->AppendSwitch(switches::kEnableSyncSessions); |
| 176 | 176 |
| 177 // Disable non-essential access of external network resources. | 177 // Disable non-essential access of external network resources. |
| 178 if (!cl->HasSwitch(switches::kDisableBackgroundNetworking)) | 178 if (!cl->HasSwitch(switches::kDisableBackgroundNetworking)) |
| 179 cl->AppendSwitch(switches::kDisableBackgroundNetworking); | 179 cl->AppendSwitch(switches::kDisableBackgroundNetworking); |
| 180 | 180 |
| 181 cl->AppendSwitch(switches::kNewSyncerThread); | |
|
Raghu Simha
2011/04/14 23:19:15
I'm not sure if you meant to permanently add this
| |
| 182 | |
| 181 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_CHROMEOS) | 183 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_CHROMEOS) |
| 182 // Use a basic non-encrypted password store on Linux while running tests. | 184 // Use a basic non-encrypted password store on Linux while running tests. |
| 183 // See http://code.google.com/p/chromium/wiki/LinuxPasswordStorage. | 185 // See http://code.google.com/p/chromium/wiki/LinuxPasswordStorage. |
| 184 if (!cl->HasSwitch(switches::kPasswordStore)) | 186 if (!cl->HasSwitch(switches::kPasswordStore)) |
| 185 cl->AppendSwitchASCII(switches::kPasswordStore, "basic"); | 187 cl->AppendSwitchASCII(switches::kPasswordStore, "basic"); |
| 186 #endif | 188 #endif |
| 187 } | 189 } |
| 188 | 190 |
| 189 // static | 191 // static |
| 190 Profile* LiveSyncTest::MakeProfile(const FilePath::StringType name) { | 192 Profile* LiveSyncTest::MakeProfile(const FilePath::StringType name) { |
| (...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 470 const net::ProxyConfig& proxy_config) { | 472 const net::ProxyConfig& proxy_config) { |
| 471 base::WaitableEvent done(false, false); | 473 base::WaitableEvent done(false, false); |
| 472 BrowserThread::PostTask( | 474 BrowserThread::PostTask( |
| 473 BrowserThread::IO, | 475 BrowserThread::IO, |
| 474 FROM_HERE, | 476 FROM_HERE, |
| 475 new SetProxyConfigTask(&done, | 477 new SetProxyConfigTask(&done, |
| 476 context_getter, | 478 context_getter, |
| 477 proxy_config)); | 479 proxy_config)); |
| 478 done.Wait(); | 480 done.Wait(); |
| 479 } | 481 } |
| OLD | NEW |