sync: Refactor per-datatype throttling

sync/engine/syncer_unittest.cc

Index: sync/engine/syncer_unittest.cc
diff --git a/sync/engine/syncer_unittest.cc b/sync/engine/syncer_unittest.cc
index fdba503c5783d7e0d3c8b54cdaced02f25a37c37..6800f54e5a6ee43c8a46a7f46d659d496a47a9ef 100644
--- a/sync/engine/syncer_unittest.cc
+++ b/sync/engine/syncer_unittest.cc
@@ -23,6 +23,7 @@
 #include "base/stringprintf.h"
 #include "base/time.h"
 #include "build/build_config.h"
+#include "sync/engine/throttled_data_type_tracker.h"
 #include "sync/engine/get_commit_ids_command.h"
 #include "sync/engine/model_safe_worker.h"
 #include "sync/engine/net/server_connection_manager.h"
@@ -230,7 +231,9 @@ class SyncerTest : public testing::Test,
     context_.reset(
         new SyncSessionContext(
             mock_server_.get(), directory(), this,
-            &extensions_activity_monitor_, listeners, NULL,
+            &extensions_activity_monitor_,
+            &throttled_data_type_tracker_,
+            listeners, NULL,
             &traffic_recorder_));
     ASSERT_FALSE(context_->resolver());
     syncer_ = new Syncer();
@@ -523,6 +526,7 @@ class SyncerTest : public testing::Test,
   TestDirectorySetterUpper dir_maker_;
   FakeEncryptor encryptor_;
   FakeExtensionsActivityMonitor extensions_activity_monitor_;
+  ThrottledDataTypeTracker throttled_data_type_tracker_;
   scoped_ptr<MockConnectionManager> mock_server_;
 
   Syncer* syncer_;
@@ -626,7 +630,7 @@ TEST_F(SyncerTest, GetCommitIdsFiltersThrottledEntries) {
   }
 
   // Now set the throttled types.
-  context_->SetUnthrottleTime(
+  context_->throttled_data_type_tracker()->SetUnthrottleTime(
       throttled_types,
       base::TimeTicks::Now() + base::TimeDelta::FromSeconds(1200));
   SyncShareNudge();
@@ -640,7 +644,7 @@ TEST_F(SyncerTest, GetCommitIdsFiltersThrottledEntries) {
   }
 
   // Now unthrottle.
-  context_->SetUnthrottleTime(
+  context_->throttled_data_type_tracker()->SetUnthrottleTime(
       throttled_types,
       base::TimeTicks::Now() - base::TimeDelta::FromSeconds(1200));
   SyncShareNudge();