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

Unified Diff: sync/internal_api/sync_rollback_manager_unittest.cc

Issue 451743002: Pass args to SyncManager::Init via a struct. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Use scoped_ptr instead of raw pointer. Created 6 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
Index: sync/internal_api/sync_rollback_manager_unittest.cc
diff --git a/sync/internal_api/sync_rollback_manager_unittest.cc b/sync/internal_api/sync_rollback_manager_unittest.cc
index 73dbac45c79c32479748ce3c4b2043006ecc502c..b2435525b3d88accb651c1d1b7bc54d2c4b25526 100644
--- a/sync/internal_api/sync_rollback_manager_unittest.cc
+++ b/sync/internal_api/sync_rollback_manager_unittest.cc
@@ -111,27 +111,16 @@ class SyncRollbackManagerTest : public testing::Test,
&SyncRollbackManagerTest::HandleInit)));
manager->AddObserver(this);
- TestInternalComponentsFactory factory(InternalComponentsFactory::Switches(),
- storage_option);
base::RunLoop run_loop;
- manager->Init(
- temp_dir_.path(),
- MakeWeakHandle(base::WeakPtr<JsEventHandler>()),
- GURL("https://example.com/"),
- scoped_ptr<HttpPostProviderFactory>().Pass(),
- std::vector<scoped_refptr<ModelSafeWorker> >(1, worker_.get()),
- NULL,
- delegate,
- SyncCredentials(),
- "",
- "",
- "",
- &factory,
- NULL,
- scoped_ptr<UnrecoverableErrorHandler>().Pass(),
- NULL,
- NULL);
+ SyncManager::InitArgs args;
+ args.database_location = temp_dir_.path();
+ args.service_url = GURL("https://example.com/");
+ args.workers.push_back(worker_);
+ args.change_delegate = delegate;
+ args.internal_components_factory.reset(new TestInternalComponentsFactory(
+ InternalComponentsFactory::Switches(), storage_option));
+ manager->Init(&args);
loop_.PostTask(FROM_HERE, run_loop.QuitClosure());
run_loop.Run();
}
« no previous file with comments | « sync/internal_api/sync_rollback_manager_base_unittest.cc ('k') | sync/internal_api/test/fake_sync_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698