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 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
107 }; | 107 }; |
108 | 108 |
109 LiveSyncTest::LiveSyncTest(TestType test_type) | 109 LiveSyncTest::LiveSyncTest(TestType test_type) |
110 : sync_server_(net::TestServer::TYPE_SYNC, FilePath()), | 110 : sync_server_(net::TestServer::TYPE_SYNC, FilePath()), |
111 test_type_(test_type), | 111 test_type_(test_type), |
112 server_type_(SERVER_TYPE_UNDECIDED), | 112 server_type_(SERVER_TYPE_UNDECIDED), |
113 num_clients_(-1), | 113 num_clients_(-1), |
114 use_verifier_(true), | 114 use_verifier_(true), |
115 test_server_handle_(base::kNullProcessHandle) { | 115 test_server_handle_(base::kNullProcessHandle) { |
116 InProcessBrowserTest::set_show_window(true); | 116 InProcessBrowserTest::set_show_window(true); |
117 SyncDatatypeHelper::AssociateWithTest(this); | 117 sync_datatype_helper::AssociateWithTest(this); |
118 switch (test_type_) { | 118 switch (test_type_) { |
119 case SINGLE_CLIENT: { | 119 case SINGLE_CLIENT: { |
120 num_clients_ = 1; | 120 num_clients_ = 1; |
121 break; | 121 break; |
122 } | 122 } |
123 case TWO_CLIENT: { | 123 case TWO_CLIENT: { |
124 num_clients_ = 2; | 124 num_clients_ = 2; |
125 break; | 125 break; |
126 } | 126 } |
127 case MULTIPLE_CLIENT: { | 127 case MULTIPLE_CLIENT: { |
(...skipping 400 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
528 const net::ProxyConfig& proxy_config) { | 528 const net::ProxyConfig& proxy_config) { |
529 base::WaitableEvent done(false, false); | 529 base::WaitableEvent done(false, false); |
530 BrowserThread::PostTask( | 530 BrowserThread::PostTask( |
531 BrowserThread::IO, | 531 BrowserThread::IO, |
532 FROM_HERE, | 532 FROM_HERE, |
533 new SetProxyConfigTask(&done, | 533 new SetProxyConfigTask(&done, |
534 context_getter, | 534 context_getter, |
535 proxy_config)); | 535 proxy_config)); |
536 done.Wait(); | 536 done.Wait(); |
537 } | 537 } |
OLD | NEW |