| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/browser/sync/test/integration/sync_test.h" | 5 #include "chrome/browser/sync/test/integration/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/bind.h" | 10 #include "base/bind.h" |
| (...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 190 | 190 |
| 191 void SyncTest::AddTestSwitches(CommandLine* cl) { | 191 void SyncTest::AddTestSwitches(CommandLine* cl) { |
| 192 // TODO(rsimha): Until we implement a fake Tango server against which tests | 192 // TODO(rsimha): Until we implement a fake Tango server against which tests |
| 193 // can run, we need to set the --sync-notification-method to "p2p". | 193 // can run, we need to set the --sync-notification-method to "p2p". |
| 194 if (!cl->HasSwitch(switches::kSyncNotificationMethod)) | 194 if (!cl->HasSwitch(switches::kSyncNotificationMethod)) |
| 195 cl->AppendSwitchASCII(switches::kSyncNotificationMethod, "p2p"); | 195 cl->AppendSwitchASCII(switches::kSyncNotificationMethod, "p2p"); |
| 196 | 196 |
| 197 // Disable non-essential access of external network resources. | 197 // Disable non-essential access of external network resources. |
| 198 if (!cl->HasSwitch(switches::kDisableBackgroundNetworking)) | 198 if (!cl->HasSwitch(switches::kDisableBackgroundNetworking)) |
| 199 cl->AppendSwitch(switches::kDisableBackgroundNetworking); | 199 cl->AppendSwitch(switches::kDisableBackgroundNetworking); |
| 200 |
| 201 // TODO(sync): remove this once keystore encryption is enabled by default. |
| 202 if (!cl->HasSwitch(switches::kSyncKeystoreEncryption)) |
| 203 cl->AppendSwitch(switches::kSyncKeystoreEncryption); |
| 200 } | 204 } |
| 201 | 205 |
| 202 void SyncTest::AddOptionalTypesToCommandLine(CommandLine* cl) {} | 206 void SyncTest::AddOptionalTypesToCommandLine(CommandLine* cl) {} |
| 203 | 207 |
| 204 // static | 208 // static |
| 205 Profile* SyncTest::MakeProfile(const FilePath::StringType name) { | 209 Profile* SyncTest::MakeProfile(const FilePath::StringType name) { |
| 206 FilePath path; | 210 FilePath path; |
| 207 PathService::Get(chrome::DIR_USER_DATA, &path); | 211 PathService::Get(chrome::DIR_USER_DATA, &path); |
| 208 path = path.Append(name); | 212 path = path.Append(name); |
| 209 | 213 |
| (...skipping 575 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 785 | 789 |
| 786 void SyncTest::SetProxyConfig(net::URLRequestContextGetter* context_getter, | 790 void SyncTest::SetProxyConfig(net::URLRequestContextGetter* context_getter, |
| 787 const net::ProxyConfig& proxy_config) { | 791 const net::ProxyConfig& proxy_config) { |
| 788 base::WaitableEvent done(false, false); | 792 base::WaitableEvent done(false, false); |
| 789 BrowserThread::PostTask( | 793 BrowserThread::PostTask( |
| 790 BrowserThread::IO, FROM_HERE, | 794 BrowserThread::IO, FROM_HERE, |
| 791 base::Bind(&SetProxyConfigCallback, &done, | 795 base::Bind(&SetProxyConfigCallback, &done, |
| 792 make_scoped_refptr(context_getter), proxy_config)); | 796 make_scoped_refptr(context_getter), proxy_config)); |
| 793 done.Wait(); | 797 done.Wait(); |
| 794 } | 798 } |
| OLD | NEW |