Revert 238348 "Clean up TestProfileSyncService and related tests"

trunk/src/chrome/browser/sync/profile_sync_service.h

 // Copyright (c) 2012 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_PROFILE_SYNC_SERVICE_H_
 #define CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_
 
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 682 matching lines @@
   // still in deferred start mode, meaning the SyncableService hasn't been
   // told to MergeDataAndStartSyncing yet.
   void OnDataTypeRequestsSyncStartup(syncer::ModelType type);
 
   // Return sync token status.
   SyncTokenStatus GetSyncTokenStatus() const;
 
   browser_sync::FaviconCache* GetFaviconCache();
 
  protected:
+  // Used by test classes that derive from ProfileSyncService.
+  virtual browser_sync::SyncBackendHost* GetBackendForTest();
+
   // Helper to configure the priority data types.
   void ConfigurePriorityDataTypes();
 
   // Helper to install and configure a data type manager.
   void ConfigureDataTypeManager();
 
   // Shuts down the backend sync components.
   // |option| indicates if syncing is being disabled or not, and whether
   // to claim ownership of sync thread from backend.
   void ShutdownImpl(browser_sync::SyncBackendHost::ShutdownOption option);
@@ skipping 325 matching lines @@
   scoped_ptr<SessionsSyncManager> sessions_sync_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileSyncService);
 };
 
 bool ShouldShowActionOnUI(
     const syncer::SyncProtocolError& error);
 
 
 #endif  // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_