| 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 190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 201 void LiveSyncTest::SetUpCommandLine(CommandLine* cl) { | 201 void LiveSyncTest::SetUpCommandLine(CommandLine* cl) { |
| 202 // TODO(rsimha): Until we implement a fake Tango server against which tests | 202 // TODO(rsimha): Until we implement a fake Tango server against which tests |
| 203 // can run, we need to set the --sync-notification-method to "p2p". | 203 // can run, we need to set the --sync-notification-method to "p2p". |
| 204 if (!cl->HasSwitch(switches::kSyncNotificationMethod)) | 204 if (!cl->HasSwitch(switches::kSyncNotificationMethod)) |
| 205 cl->AppendSwitchASCII(switches::kSyncNotificationMethod, "p2p"); | 205 cl->AppendSwitchASCII(switches::kSyncNotificationMethod, "p2p"); |
| 206 | 206 |
| 207 // TODO(sync): Remove this once sessions sync is enabled by default. | 207 // TODO(sync): Remove this once sessions sync is enabled by default. |
| 208 if (!cl->HasSwitch(switches::kEnableSyncSessions)) | 208 if (!cl->HasSwitch(switches::kEnableSyncSessions)) |
| 209 cl->AppendSwitch(switches::kEnableSyncSessions); | 209 cl->AppendSwitch(switches::kEnableSyncSessions); |
| 210 | 210 |
| 211 // TODO(sync): Remove this once typed url sync is enabled by default. | |
| 212 if (!cl->HasSwitch(switches::kEnableSyncTypedUrls)) | |
| 213 cl->AppendSwitch(switches::kEnableSyncTypedUrls); | |
| 214 | |
| 215 // Disable non-essential access of external network resources. | 211 // Disable non-essential access of external network resources. |
| 216 if (!cl->HasSwitch(switches::kDisableBackgroundNetworking)) | 212 if (!cl->HasSwitch(switches::kDisableBackgroundNetworking)) |
| 217 cl->AppendSwitch(switches::kDisableBackgroundNetworking); | 213 cl->AppendSwitch(switches::kDisableBackgroundNetworking); |
| 218 } | 214 } |
| 219 | 215 |
| 220 // static | 216 // static |
| 221 Profile* LiveSyncTest::MakeProfile(const FilePath::StringType name) { | 217 Profile* LiveSyncTest::MakeProfile(const FilePath::StringType name) { |
| 222 FilePath path; | 218 FilePath path; |
| 223 PathService::Get(chrome::DIR_USER_DATA, &path); | 219 PathService::Get(chrome::DIR_USER_DATA, &path); |
| 224 path = path.Append(name); | 220 path = path.Append(name); |
| (...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 536 const net::ProxyConfig& proxy_config) { | 532 const net::ProxyConfig& proxy_config) { |
| 537 base::WaitableEvent done(false, false); | 533 base::WaitableEvent done(false, false); |
| 538 BrowserThread::PostTask( | 534 BrowserThread::PostTask( |
| 539 BrowserThread::IO, | 535 BrowserThread::IO, |
| 540 FROM_HERE, | 536 FROM_HERE, |
| 541 new SetProxyConfigTask(&done, | 537 new SetProxyConfigTask(&done, |
| 542 context_getter, | 538 context_getter, |
| 543 proxy_config)); | 539 proxy_config)); |
| 544 done.Wait(); | 540 done.Wait(); |
| 545 } | 541 } |
| OLD | NEW |