sync: move invalidation version prefs out of SyncPrefs into InvalidatorStorage.

chrome/browser/sync/test_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_TEST_PROFILE_SYNC_SERVICE_H_
 #define CHROME_BROWSER_SYNC_TEST_PROFILE_SYNC_SERVICE_H_
 #pragma once
 
 #include <string>
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/sync/glue/data_type_manager_impl.h"
+#include "chrome/browser/sync/invalidations/invalidator_storage.h"
 #include "chrome/browser/sync/profile_sync_service.h"
+#include "chrome/browser/sync/sync_prefs.h"
 #include "chrome/test/base/profile_mock.h"
 #include "sync/test/engine/test_id_factory.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 class Profile;
 class Task;
 class TestProfileSyncService;
 
 ACTION(ReturnNewDataTypeManager) {
   return new browser_sync::DataTypeManagerImpl(arg0, arg1);
 }
 
 namespace browser_sync {
 
 class SyncBackendHostForProfileSyncTest : public SyncBackendHost {
  public:
   // |synchronous_init| causes initialization to block until the syncapi has
   //     completed setting itself up and called us back.
   SyncBackendHostForProfileSyncTest(
       Profile* profile,
       const base::WeakPtr<SyncPrefs>& sync_prefs,
+      const base::WeakPtr<InvalidatorStorage>& invalidator_storage,
       bool set_initial_sync_ended_on_init,
       bool synchronous_init,
       bool fail_initial_download,
       bool use_real_database);
   virtual ~SyncBackendHostForProfileSyncTest();
 
   MOCK_METHOD1(RequestNudge, void(const tracked_objects::Location&));
 
   // Called when a nudge comes in.
   void SimulateSyncCycleCompletedInitialSyncEnded(
@@ skipping 71 matching lines @@
   base::Closure callback_;
   bool set_initial_sync_ended_on_init_;
 
   bool fail_initial_download_;
   bool use_real_database_;
 };
 
 
 
 #endif  // CHROME_BROWSER_SYNC_TEST_PROFILE_SYNC_SERVICE_H_