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

Unified Diff: components/browser_sync/browser/profile_sync_components_factory_impl.h

Issue 2328393002: [Sync] Add a sanity integration test for USS. (Closed)
Patch Set: Ensure static changes don't persist between tests. Created 4 years, 3 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: components/browser_sync/browser/profile_sync_components_factory_impl.h
diff --git a/components/browser_sync/browser/profile_sync_components_factory_impl.h b/components/browser_sync/browser/profile_sync_components_factory_impl.h
index 6b3024b04ba1605e07fe72235081b6ddfd8dcd6f..1a914a44c8719947d4a3db7d165d1b4792ded7d4 100644
--- a/components/browser_sync/browser/profile_sync_components_factory_impl.h
+++ b/components/browser_sync/browser/profile_sync_components_factory_impl.h
@@ -88,6 +88,10 @@ class ProfileSyncComponentsFactoryImpl
sync_driver::SyncService* sync_service,
std::unique_ptr<syncer::DataTypeErrorHandler> error_handler) override;
+ // Sets a bit that determines whether PREFERENCES should be registered with a
+ // ModelTypeController for testing purposes.
+ static void OverridePrefsForUssTest(bool use_uss);
skym 2016/09/12 19:57:50 ...So is there going to be an OverrideBookmarksFor
maxbogue 2016/09/13 03:44:54 Nope, any real datatype will have their own flag (
skym 2016/09/13 15:54:32 Still completely disagree, as we discussed offline
maxbogue 2016/09/13 19:15:26 Right, but it's for a fake purpose, which is why t
+
private:
// Register data types which are enabled on both desktop and mobile.
// |disabled_types| and |enabled_types| correspond only to those types
@@ -117,6 +121,9 @@ class ProfileSyncComponentsFactoryImpl
base::WeakPtrFactory<ProfileSyncComponentsFactoryImpl> weak_factory_;
+ // Whether to override PREFERENCES to use USS.
+ static bool override_prefs_for_uss_test_;
skym 2016/09/12 19:57:50 I find this variable name super misleading. Sounds
maxbogue 2016/09/13 03:44:54 Changed to override_prefs_controller_to_uss_for_te
+
DISALLOW_COPY_AND_ASSIGN(ProfileSyncComponentsFactoryImpl);
};

Powered by Google App Engine
This is Rietveld 408576698