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

Side by Side Diff: chrome/browser/sync/glue/sync_backend_host.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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef CHROME_BROWSER_SYNC_GLUE_SYNC_BACKEND_HOST_H_ 5 #ifndef CHROME_BROWSER_SYNC_GLUE_SYNC_BACKEND_HOST_H_
6 #define CHROME_BROWSER_SYNC_GLUE_SYNC_BACKEND_HOST_H_ 6 #define CHROME_BROWSER_SYNC_GLUE_SYNC_BACKEND_HOST_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 281 matching lines...) Expand 10 before | Expand all | Expand 10 after
292 syncer::ExtensionsActivityMonitor* extensions_activity_monitor, 292 syncer::ExtensionsActivityMonitor* extensions_activity_monitor,
293 const syncer::WeakHandle<syncer::JsEventHandler>& event_handler, 293 const syncer::WeakHandle<syncer::JsEventHandler>& event_handler,
294 const GURL& service_url, 294 const GURL& service_url,
295 MakeHttpBridgeFactoryFn make_http_bridge_factory_fn, 295 MakeHttpBridgeFactoryFn make_http_bridge_factory_fn,
296 const syncer::SyncCredentials& credentials, 296 const syncer::SyncCredentials& credentials,
297 ChromeSyncNotificationBridge* chrome_sync_notification_bridge, 297 ChromeSyncNotificationBridge* chrome_sync_notification_bridge,
298 syncer::SyncNotifierFactory* sync_notifier_factory, 298 syncer::SyncNotifierFactory* sync_notifier_factory,
299 syncer::SyncManagerFactory* sync_manager_factory, 299 syncer::SyncManagerFactory* sync_manager_factory,
300 bool delete_sync_data_folder, 300 bool delete_sync_data_folder,
301 const std::string& restored_key_for_bootstrapping, 301 const std::string& restored_key_for_bootstrapping,
302 syncer::SyncManager::TestingMode testing_mode, 302 syncer::InternalComponentsFactory* internal_components_factory,
303 syncer::UnrecoverableErrorHandler* unrecoverable_error_handler, 303 syncer::UnrecoverableErrorHandler* unrecoverable_error_handler,
304 syncer::ReportUnrecoverableErrorFunction 304 syncer::ReportUnrecoverableErrorFunction
305 report_unrecoverable_error_function); 305 report_unrecoverable_error_function);
306 ~DoInitializeOptions(); 306 ~DoInitializeOptions();
307 307
308 MessageLoop* sync_loop; 308 MessageLoop* sync_loop;
309 SyncBackendRegistrar* registrar; 309 SyncBackendRegistrar* registrar;
310 syncer::ModelSafeRoutingInfo routing_info; 310 syncer::ModelSafeRoutingInfo routing_info;
311 std::vector<syncer::ModelSafeWorker*> workers; 311 std::vector<syncer::ModelSafeWorker*> workers;
312 syncer::ExtensionsActivityMonitor* extensions_activity_monitor; 312 syncer::ExtensionsActivityMonitor* extensions_activity_monitor;
313 syncer::WeakHandle<syncer::JsEventHandler> event_handler; 313 syncer::WeakHandle<syncer::JsEventHandler> event_handler;
314 GURL service_url; 314 GURL service_url;
315 // Overridden by tests. 315 // Overridden by tests.
316 MakeHttpBridgeFactoryFn make_http_bridge_factory_fn; 316 MakeHttpBridgeFactoryFn make_http_bridge_factory_fn;
317 syncer::SyncCredentials credentials; 317 syncer::SyncCredentials credentials;
318 ChromeSyncNotificationBridge* const chrome_sync_notification_bridge; 318 ChromeSyncNotificationBridge* const chrome_sync_notification_bridge;
319 syncer::SyncNotifierFactory* const sync_notifier_factory; 319 syncer::SyncNotifierFactory* const sync_notifier_factory;
320 syncer::SyncManagerFactory* const sync_manager_factory; 320 syncer::SyncManagerFactory* const sync_manager_factory;
321 std::string lsid; 321 std::string lsid;
322 bool delete_sync_data_folder; 322 bool delete_sync_data_folder;
323 std::string restored_key_for_bootstrapping; 323 std::string restored_key_for_bootstrapping;
324 syncer::SyncManager::TestingMode testing_mode; 324 syncer::InternalComponentsFactory* internal_components_factory;
325 syncer::UnrecoverableErrorHandler* unrecoverable_error_handler; 325 syncer::UnrecoverableErrorHandler* unrecoverable_error_handler;
326 syncer::ReportUnrecoverableErrorFunction 326 syncer::ReportUnrecoverableErrorFunction
327 report_unrecoverable_error_function; 327 report_unrecoverable_error_function;
328 }; 328 };
329 329
330 // Allows tests to perform alternate core initialization work. 330 // Allows tests to perform alternate core initialization work.
331 virtual void InitCore(const DoInitializeOptions& options); 331 virtual void InitCore(const DoInitializeOptions& options);
332 332
333 // Request the syncer to reconfigure with the specfied params. 333 // Request the syncer to reconfigure with the specfied params.
334 // Virtual for testing. 334 // Virtual for testing.
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
502 502
503 // UI-thread cache of the last SyncSessionSnapshot received from syncapi. 503 // UI-thread cache of the last SyncSessionSnapshot received from syncapi.
504 syncer::sessions::SyncSessionSnapshot last_snapshot_; 504 syncer::sessions::SyncSessionSnapshot last_snapshot_;
505 505
506 DISALLOW_COPY_AND_ASSIGN(SyncBackendHost); 506 DISALLOW_COPY_AND_ASSIGN(SyncBackendHost);
507 }; 507 };
508 508
509 } // namespace browser_sync 509 } // namespace browser_sync
510 510
511 #endif // CHROME_BROWSER_SYNC_GLUE_SYNC_BACKEND_HOST_H_ 511 #endif // CHROME_BROWSER_SYNC_GLUE_SYNC_BACKEND_HOST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698