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

chrome/browser/sync/glue/session_model_associator.h

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_SYNC_GLUE_SESSION_MODEL_ASSOCIATOR_H_
 #define CHROME_BROWSER_SYNC_GLUE_SESSION_MODEL_ASSOCIATOR_H_
 #pragma once
 
 #include <map>
 #include <string>
 #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"
 #include "base/string_util.h"
 #include "base/threading/non_thread_safe.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/sessions/session_id.h"
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sessions/session_types.h"
@@ skipping 22 matching lines @@
 static const char kSessionsTag[] = "google_chrome_sessions";
 
 // Contains all logic for associating the Chrome sessions model and
 // the sync sessions model.
 class SessionModelAssociator
     : public PerDataTypeAssociatorInterface<TabContents, size_t>,
       public base::NonThreadSafe {
  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
   // nodes other than the permanent tagged nodes.  The method may
   // return false if an error occurred.
   virtual bool SyncModelHasUserCreatedNodes(bool* has_nodes);
 
   // AssociatorInterface and PerDataTypeAssociator Interface implementation.
   virtual void AbortAssociation() {
     // No implementation needed, this associator runs on the main thread.
@@ skipping 228 matching lines @@
   // SessionTab*'s.
   void DeleteForeignSessions();
 
   // Determine if a window is of a type we're interested in syncing.
   static bool ShouldSyncWindowType(const Browser::Type& type);
 
   // Build a sync tag from tab_node_id.
   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.
   void InitializeCurrentMachineTag(sync_api::WriteTransaction* trans);
 
   // Updates the server data based upon the current client session.  If no node
   // corresponding to this machine exists in the sync model, one is created.
   void UpdateSyncModelDataFromClient();
 
   // Pulls the current sync model from the sync database and returns true upon
@@ skipping 76 matching lines @@
   TabLinksMap tab_map_;
 
   ForeignSessionTracker foreign_session_tracker_;
 
   // Weak pointer.
   ProfileSyncService* sync_service_;
 
   // 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);
 };
 
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_GLUE_SESSION_MODEL_ASSOCIATOR_H_