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

Unified Diff: sync/internal_api/syncapi_unittest.cc

Issue 10830100: Fix SyncManager initialization failure crash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add virtual destructor Created 8 years, 5 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
« no previous file with comments | « sync/internal_api/sync_manager_impl.cc ('k') | sync/internal_api/test/test_internal_components_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/internal_api/syncapi_unittest.cc
diff --git a/sync/internal_api/syncapi_unittest.cc b/sync/internal_api/syncapi_unittest.cc
index e43a2e2ab7760549a5557478e5d1552032b9e86a..18bf2a77f5cd85f3f8d3dc2f60e98fcdaee175ed 100644
--- a/sync/internal_api/syncapi_unittest.cc
+++ b/sync/internal_api/syncapi_unittest.cc
@@ -881,8 +881,7 @@ class SyncManagerTest : public testing::Test,
}
virtual InternalComponentsFactory* GetFactory() {
- return new TestInternalComponentsFactory(
- TestInternalComponentsFactory::IN_MEMORY);
+ return new TestInternalComponentsFactory(STORAGE_IN_MEMORY);
}
// Returns true if we are currently encrypting all sync data. May
@@ -2521,7 +2520,7 @@ class ComponentsFactory : public TestInternalComponentsFactory {
ComponentsFactory(SyncScheduler* scheduler_to_use,
sessions::SyncSessionContext** session_context)
: TestInternalComponentsFactory(
- TestInternalComponentsFactory::IN_MEMORY),
+ syncer::STORAGE_IN_MEMORY),
scheduler_to_use_(scheduler_to_use),
session_context_(session_context) {}
virtual ~ComponentsFactory() {}
« no previous file with comments | « sync/internal_api/sync_manager_impl.cc ('k') | sync/internal_api/test/test_internal_components_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698