Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(247)

Side by Side Diff: chrome/test/live_sync/live_sync_test.cc

Issue 6249006: Turn password sync on by default. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/common/chrome_switches.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 void LiveSyncTest::SetUpCommandLine(CommandLine* cl) { 167 void LiveSyncTest::SetUpCommandLine(CommandLine* cl) {
168 // TODO(rsimha): Until we implement a fake Tango server against which tests 168 // TODO(rsimha): Until we implement a fake Tango server against which tests
169 // can run, we need to set the --sync-notification-method to "p2p". 169 // can run, we need to set the --sync-notification-method to "p2p".
170 if (!cl->HasSwitch(switches::kSyncNotificationMethod)) 170 if (!cl->HasSwitch(switches::kSyncNotificationMethod))
171 cl->AppendSwitchASCII(switches::kSyncNotificationMethod, "p2p"); 171 cl->AppendSwitchASCII(switches::kSyncNotificationMethod, "p2p");
172 172
173 // TODO(sync): Remove this once sessions sync is enabled by default. 173 // TODO(sync): Remove this once sessions sync is enabled by default.
174 if (!cl->HasSwitch(switches::kEnableSyncSessions)) 174 if (!cl->HasSwitch(switches::kEnableSyncSessions))
175 cl->AppendSwitch(switches::kEnableSyncSessions); 175 cl->AppendSwitch(switches::kEnableSyncSessions);
176 176
177 // TODO(sync): Remove this once passwords sync is enabled by default.
178 if (!cl->HasSwitch(switches::kEnableSyncPasswords))
179 cl->AppendSwitch(switches::kEnableSyncPasswords);
180
181 // Disable non-essential access of external network resources. 177 // Disable non-essential access of external network resources.
182 if (!cl->HasSwitch(switches::kDisableBackgroundNetworking)) 178 if (!cl->HasSwitch(switches::kDisableBackgroundNetworking))
183 cl->AppendSwitch(switches::kDisableBackgroundNetworking); 179 cl->AppendSwitch(switches::kDisableBackgroundNetworking);
184 } 180 }
185 181
186 // static 182 // static
187 Profile* LiveSyncTest::MakeProfile(const FilePath::StringType name) { 183 Profile* LiveSyncTest::MakeProfile(const FilePath::StringType name) {
188 FilePath path; 184 FilePath path;
189 PathService::Get(chrome::DIR_USER_DATA, &path); 185 PathService::Get(chrome::DIR_USER_DATA, &path);
190 return ProfileManager::CreateProfile(path.Append(name)); 186 return ProfileManager::CreateProfile(path.Append(name));
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after
467 const net::ProxyConfig& proxy_config) { 463 const net::ProxyConfig& proxy_config) {
468 base::WaitableEvent done(false, false); 464 base::WaitableEvent done(false, false);
469 BrowserThread::PostTask( 465 BrowserThread::PostTask(
470 BrowserThread::IO, 466 BrowserThread::IO,
471 FROM_HERE, 467 FROM_HERE,
472 new SetProxyConfigTask(&done, 468 new SetProxyConfigTask(&done,
473 context_getter, 469 context_getter,
474 proxy_config)); 470 proxy_config));
475 done.Wait(); 471 done.Wait();
476 } 472 }
OLDNEW
« no previous file with comments | « chrome/common/chrome_switches.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698