Revert 75287 - [Sync] Initial support for encrypting any datatype (no UI hook...

chrome/browser/sync/glue/session_model_associator.h

Index: chrome/browser/sync/glue/session_model_associator.h
===================================================================
--- chrome/browser/sync/glue/session_model_associator.h	(revision 75295)
+++ chrome/browser/sync/glue/session_model_associator.h	(working copy)
@@ -11,7 +11,6 @@
 #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"
@@ -54,8 +53,6 @@
  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
@@ -304,8 +301,8 @@
   static inline std::string TabIdToTag(
       const std::string machine_tag,
       size_t tab_node_id) {
-    return StringPrintf("%s %"PRIuS"",
-        machine_tag.c_str(), tab_node_id);
+    return StringPrintf("%s %lu",
+        machine_tag.c_str(), static_cast<unsigned long>(tab_node_id));
   }
 
   // Initializes the tag corresponding to this machine.
@@ -402,9 +399,6 @@
   // 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);
 };