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 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
135 // server is implemented. | 135 // server is implemented. |
136 // The chrome sync builders are behind a firewall that blocks port 5222, the | 136 // The chrome sync builders are behind a firewall that blocks port 5222, the |
137 // default port for XMPP notifications. This causes the tests to spend up to a | 137 // default port for XMPP notifications. This causes the tests to spend up to a |
138 // minute waiting for a connection on port 5222 before they fail over to port | 138 // minute waiting for a connection on port 5222 before they fail over to port |
139 // 443, the default SSL/TCP port. This switch causes the tests to use port 443 | 139 // 443, the default SSL/TCP port. This switch causes the tests to use port 443 |
140 // by default, without having to try port 5222. | 140 // by default, without having to try port 5222. |
141 if (!cl->HasSwitch(switches::kSyncTrySsltcpFirstForXmpp)) { | 141 if (!cl->HasSwitch(switches::kSyncTrySsltcpFirstForXmpp)) { |
142 cl->AppendSwitch(switches::kSyncTrySsltcpFirstForXmpp); | 142 cl->AppendSwitch(switches::kSyncTrySsltcpFirstForXmpp); |
143 } | 143 } |
144 | 144 |
| 145 // TODO(sync): Remove this once sessions sync is enabled by default. |
| 146 if (!cl->HasSwitch(switches::kEnableSyncSessions)) { |
| 147 cl->AppendSwitch(switches::kEnableSyncSessions); |
| 148 } |
| 149 |
145 // Mock the Mac Keychain service. The real Keychain can block on user input. | 150 // Mock the Mac Keychain service. The real Keychain can block on user input. |
146 #if defined(OS_MACOSX) | 151 #if defined(OS_MACOSX) |
147 Encryptor::UseMockKeychain(true); | 152 Encryptor::UseMockKeychain(true); |
148 #endif | 153 #endif |
149 | 154 |
150 // Yield control back to the InProcessBrowserTest framework. | 155 // Yield control back to the InProcessBrowserTest framework. |
151 InProcessBrowserTest::SetUp(); | 156 InProcessBrowserTest::SetUp(); |
152 } | 157 } |
153 | 158 |
154 void LiveSyncTest::TearDown() { | 159 void LiveSyncTest::TearDown() { |
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
413 const net::ProxyConfig& proxy_config) { | 418 const net::ProxyConfig& proxy_config) { |
414 base::WaitableEvent done(false, false); | 419 base::WaitableEvent done(false, false); |
415 BrowserThread::PostTask( | 420 BrowserThread::PostTask( |
416 BrowserThread::IO, | 421 BrowserThread::IO, |
417 FROM_HERE, | 422 FROM_HERE, |
418 new SetProxyConfigTask(&done, | 423 new SetProxyConfigTask(&done, |
419 context_getter, | 424 context_getter, |
420 proxy_config)); | 425 proxy_config)); |
421 done.Wait(); | 426 done.Wait(); |
422 } | 427 } |
OLD | NEW |