Revert 56423 - Added classes to enable session sync functionality.

TEST=ProfileSyncServiceSessionTest
BUG=30519

Original patch by jerrica@chromium.org
Original review: http://codereview.chromium.org/3168009

Review URL: http://codereview.chromium.org/3184004

TBR=tim@chromium.org
Review URL: http://codereview.chromium.org/3127017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56426 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 11 deletions

diff --git a/chrome/browser/sync/profile_sync_service.h b/chrome/browser/sync/profile_sync_service.h
index 3f5ddaa..6566e40 100644
--- a/chrome/browser/sync/profile_sync_service.h
+++ b/chrome/browser/sync/profile_sync_service.h
@@ -18,7 +18,6 @@
 #include "chrome/browser/pref_member.h"
 #include "chrome/browser/sync/glue/data_type_controller.h"
 #include "chrome/browser/sync/glue/data_type_manager.h"
-#include "chrome/browser/sync/glue/session_model_associator.h"
 #include "chrome/browser/sync/glue/sync_backend_host.h"
 #include "chrome/browser/sync/notification_method.h"
 #include "chrome/browser/sync/profile_sync_service_observer.h"
@@ -128,11 +127,6 @@ class ProfileSyncService : public browser_sync::SyncFrontend,
   void RegisterDataTypeController(
       browser_sync::DataTypeController* data_type_controller);
 
-  // Returns the session model associator associated with this type, but only if
-  // the associator is running.  If it is doing anything else, it will return
-  // null.
-  browser_sync::SessionModelAssociator* GetSessionModelAssociator();
-
   // Fills state_map with a map of current data types that are possible to
   // sync, as well as their states.
   void GetDataTypeControllerStates(
@@ -301,10 +295,6 @@ class ProfileSyncService : public browser_sync::SyncFrontend,
   // NotificationService when the outcome is known.
   virtual void SetPassphrase(const std::string& passphrase);
 
-  // Returns whether processing changes is allowed.  Check this before doing
-  // any model-modifying operations.
-  bool ShouldPushChanges();
-
  protected:
   // Used by ProfileSyncServiceMock only.
   //
@@ -316,6 +306,10 @@ class ProfileSyncService : public browser_sync::SyncFrontend,
   // Helper to install and configure a data type manager.
   void ConfigureDataTypeManager();
 
+  // Returns whether processing changes is allowed.  Check this before doing
+  // any model-modifying operations.
+  bool ShouldPushChanges();
+
   // Starts up the backend sync components.
   void StartUp();
   // Shuts down the backend sync components.
@@ -350,7 +344,6 @@ class ProfileSyncService : public browser_sync::SyncFrontend,
  private:
   friend class ProfileSyncServiceTest;
   friend class ProfileSyncServicePreferenceTest;
-  friend class ProfileSyncServiceSessionTest;
   friend class ProfileSyncServiceTestHarness;
   FRIEND_TEST_ALL_PREFIXES(ProfileSyncServiceTest, InitialState);
   FRIEND_TEST_ALL_PREFIXES(ProfileSyncServiceTest,