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

Unified Diff: sync/internal_api/public/sync_manager.h

Issue 10701046: sync: Remove SyncManager::TestingMode in favour of InternalComponentsFactory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: now with more scope 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
Index: sync/internal_api/public/sync_manager.h
diff --git a/sync/internal_api/public/sync_manager.h b/sync/internal_api/public/sync_manager.h
index 87567b85bf583b71df069a5f73d3643b9e65eb15..db5c210379b2f9718625b1b3e4c2a61d7a907149 100644
--- a/sync/internal_api/public/sync_manager.h
+++ b/sync/internal_api/public/sync_manager.h
@@ -21,7 +21,6 @@
#include "sync/internal_api/public/engine/model_safe_worker.h"
#include "sync/internal_api/public/engine/sync_status.h"
#include "sync/internal_api/public/util/report_unrecoverable_error_function.h"
-#include "sync/internal_api/public/util/unrecoverable_error_handler.h"
#include "sync/internal_api/public/util/weak_handle.h"
#include "sync/protocol/sync_protocol_error.h"
@@ -29,9 +28,11 @@ namespace syncer {
class Encryptor;
struct Experiments;
class ExtensionsActivityMonitor;
+class InternalComponentsFactory;
class JsBackend;
class JsEventHandler;
class SyncScheduler;
+class UnrecoverableErrorHandler;
namespace sessions {
class SyncSessionSnapshot;
@@ -337,12 +338,6 @@ class SyncManager {
virtual ~Observer();
};
- enum TestingMode {
- NON_TEST,
- TEST_ON_DISK,
- TEST_IN_MEMORY,
- };
-
SyncManager();
virtual ~SyncManager();
@@ -382,7 +377,7 @@ class SyncManager {
const SyncCredentials& credentials,
scoped_ptr<syncer::SyncNotifier> sync_notifier,
const std::string& restored_key_for_bootstrapping,
- TestingMode testing_mode,
+ scoped_ptr<InternalComponentsFactory> internal_components_factory,
syncer::Encryptor* encryptor,
syncer::UnrecoverableErrorHandler* unrecoverable_error_handler,
syncer::ReportUnrecoverableErrorFunction

Powered by Google App Engine
This is Rietveld 408576698