| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/message_loop.h" | 10 #include "base/message_loop.h" |
| (...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 111 // server is implemented. | 111 // server is implemented. |
| 112 // The chrome sync builders are behind a firewall that blocks port 5222, the | 112 // The chrome sync builders are behind a firewall that blocks port 5222, the |
| 113 // default port for XMPP notifications. This causes the tests to spend up to a | 113 // default port for XMPP notifications. This causes the tests to spend up to a |
| 114 // minute waiting for a connection on port 5222 before they fail over to port | 114 // minute waiting for a connection on port 5222 before they fail over to port |
| 115 // 443, the default SSL/TCP port. This switch causes the tests to use port 443 | 115 // 443, the default SSL/TCP port. This switch causes the tests to use port 443 |
| 116 // by default, without having to try port 5222. | 116 // by default, without having to try port 5222. |
| 117 if (!cl->HasSwitch(switches::kSyncUseSslTcp)) { | 117 if (!cl->HasSwitch(switches::kSyncUseSslTcp)) { |
| 118 cl->AppendSwitch(switches::kSyncUseSslTcp); | 118 cl->AppendSwitch(switches::kSyncUseSslTcp); |
| 119 } | 119 } |
| 120 | 120 |
| 121 // TODO(sync): Remove this once passwords sync is enabled by default. | |
| 122 if (!cl->HasSwitch(switches::kEnableSyncPasswords)) { | |
| 123 cl->AppendSwitch(switches::kEnableSyncPasswords); | |
| 124 } | |
| 125 | |
| 126 // Mock the Mac Keychain service. The real Keychain can block on user input. | 121 // Mock the Mac Keychain service. The real Keychain can block on user input. |
| 127 #if defined(OS_MACOSX) | 122 #if defined(OS_MACOSX) |
| 128 Encryptor::UseMockKeychain(true); | 123 Encryptor::UseMockKeychain(true); |
| 129 #endif | 124 #endif |
| 130 | 125 |
| 131 // Yield control back to the InProcessBrowserTest framework. | 126 // Yield control back to the InProcessBrowserTest framework. |
| 132 InProcessBrowserTest::SetUp(); | 127 InProcessBrowserTest::SetUp(); |
| 133 } | 128 } |
| 134 | 129 |
| 135 void LiveSyncTest::TearDown() { | 130 void LiveSyncTest::TearDown() { |
| (...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 391 const net::ProxyConfig& proxy_config) { | 386 const net::ProxyConfig& proxy_config) { |
| 392 base::WaitableEvent done(false, false); | 387 base::WaitableEvent done(false, false); |
| 393 BrowserThread::PostTask( | 388 BrowserThread::PostTask( |
| 394 BrowserThread::IO, | 389 BrowserThread::IO, |
| 395 FROM_HERE, | 390 FROM_HERE, |
| 396 new SetProxyConfigTask(&done, | 391 new SetProxyConfigTask(&done, |
| 397 context_getter, | 392 context_getter, |
| 398 proxy_config)); | 393 proxy_config)); |
| 399 done.Wait(); | 394 done.Wait(); |
| 400 } | 395 } |
| OLD | NEW |