chrome/browser/sync/test/integration/sync_test.cc - Issue 10837231: sync: add InternalComponentsFactory::Switches to simplify passing switches to internal components.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/sync/test/integration/sync_test.cc

Issue 10837231: sync: add InternalComponentsFactory::Switches to simplify passing switches to internal components. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: pass switches in test_profile_sync_service.cc Created 8 years, 4 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 side-by-side diff with in-line comments

Download patch

« chrome/browser/sync/glue/sync_backend_host.cc ('K') | « chrome/browser/sync/glue/sync_backend_host.cc ('k') | chrome/browser/sync/test_profile_sync_service.cc » ('j') | sync/internal_api/internal_components_factory_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/test/integration/sync_test.cc

diff --git a/chrome/browser/sync/test/integration/sync_test.cc b/chrome/browser/sync/test/integration/sync_test.cc

index 21116a480602337785a39ce5d5b2cff7980c28d4..7dcc56af6db209dc177800c015f7cc29e07eef3c 100644

--- a/chrome/browser/sync/test/integration/sync_test.cc

+++ b/chrome/browser/sync/test/integration/sync_test.cc

@@ -170,9 +170,6 @@ void SyncTest::SetUp() {

Encryptor::UseMockKeychain(true);

#endif

- // TODO(tim): Use command line flag.

- syncer::SyncSchedulerImpl::ForceShortInitialBackoffRetry();

// Yield control back to the InProcessBrowserTest framework.

InProcessBrowserTest::SetUp();

}

@@ -206,6 +203,9 @@ void SyncTest::AddTestSwitches(CommandLine* cl) {

// TODO(sync): remove this once keystore encryption is enabled by default.

if (!cl->HasSwitch(switches::kSyncKeystoreEncryption))

cl->AppendSwitch(switches::kSyncKeystoreEncryption);

+ if (!cl->HasSwitch(switches::kSyncShortInitialRetryOverride))

+ cl->AppendSwitch(switches::kSyncShortInitialRetryOverride);

}

void SyncTest::AddOptionalTypesToCommandLine(CommandLine* cl) {}