[Sync] Initial support for encrypting any datatype (no UI hookup yet).

chrome/browser/sync/glue/session_model_associator.h

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..7fe19c3f045b5b1de4914bc6d091b63032494fec 100644
--- a/chrome/browser/sync/glue/session_model_associator.h
+++ b/chrome/browser/sync/glue/session_model_associator.h
@@ -11,6 +11,7 @@
 #include <vector>
 
 #include "base/basictypes.h"
+#include "base/format_macros.h"
 #include "base/gtest_prod_util.h"
 #include "base/observer_list.h"
 #include "base/scoped_vector.h"
@@ -53,6 +54,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
@@ -301,8 +304,8 @@ class SessionModelAssociator
   static inline std::string TabIdToTag(
       const std::string machine_tag,
       size_t tab_node_id) {
-    return StringPrintf("%s %lu",
-        machine_tag.c_str(), static_cast<unsigned long>(tab_node_id));
+    return StringPrintf("%s %"PRIuS"",
+        machine_tag.c_str(), tab_node_id);
   }
 
   // Initializes the tag corresponding to this machine.
@@ -399,6 +402,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);
 };