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

Unified Diff: chrome/browser/sync/glue/session_model_associator.h

Issue 6465005: [Sync] Initial support for encrypting any datatype (no UI hookup yet). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Comments. Rest of unit tests. Created 9 years, 10 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: chrome/browser/sync/glue/session_model_associator.h
diff --git a/chrome/browser/sync/glue/session_model_associator.h b/chrome/browser/sync/glue/session_model_associator.h
index 7864c1235b4f8e7ca031139975ba4f6635764baf..69cec565137fb53f5f2d1100b4a7651d18805c89 100644
--- a/chrome/browser/sync/glue/session_model_associator.h
+++ b/chrome/browser/sync/glue/session_model_associator.h
@@ -53,6 +53,8 @@ class SessionModelAssociator
public:
// Does not take ownership of sync_service.
explicit SessionModelAssociator(ProfileSyncService* sync_service);
+ SessionModelAssociator(ProfileSyncService* sync_service,
+ bool setup_for_test);
virtual ~SessionModelAssociator();
// The has_nodes out parameter is set to true if the sync model has
@@ -399,6 +401,9 @@ class SessionModelAssociator
// Consumer used to obtain the current session.
CancelableRequestConsumer consumer_;
+ // To avoid certain checks not applicable to tests.
+ bool setup_for_test_;
+
DISALLOW_COPY_AND_ASSIGN(SessionModelAssociator);
};

Powered by Google App Engine
This is Rietveld 408576698