sync: Refactor per-datatype throttling

sync/engine/syncer_proto_util_unittest.cc

 // 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.
 
 #include "sync/engine/syncer_proto_util.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "base/time.h"
 #include "sync/engine/syncproto.h"
+#include "sync/engine/throttled_data_type_tracker.h"
 #include "sync/internal_api/public/syncable/model_type_test_util.h"
 #include "sync/protocol/bookmark_specifics.pb.h"
 #include "sync/protocol/password_specifics.pb.h"
 #include "sync/protocol/sync.pb.h"
 #include "sync/protocol/sync_enums.pb.h"
 #include "sync/sessions/session_state.h"
 #include "sync/sessions/sync_session_context.h"
 #include "sync/syncable/blob.h"
 #include "sync/syncable/syncable.h"
 #include "sync/test/engine/mock_connection_manager.h"
 #include "sync/test/engine/test_directory_setter_upper.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 
 using syncable::Blob;
 using ::testing::_;
 
 namespace browser_sync {
 using sessions::SyncSessionContext;
 
-class MockSyncSessionContext : public SyncSessionContext {
- public:
-  MockSyncSessionContext() {}
-  ~MockSyncSessionContext() {}
-  MOCK_METHOD2(SetUnthrottleTime, void(syncable::ModelTypeSet,
-                                       const base::TimeTicks&));
-};
-
 class MockDelegate : public sessions::SyncSession::Delegate {
  public:
    MockDelegate() {}
    ~MockDelegate() {}
 
   MOCK_METHOD0(IsSyncingCurrentlySilenced, bool());
   MOCK_METHOD1(OnReceivedShortPollIntervalUpdate, void(const base::TimeDelta&));
   MOCK_METHOD1(OnReceivedLongPollIntervalUpdate ,void(const base::TimeDelta&));
   MOCK_METHOD1(OnReceivedSessionsCommitDelay, void(const base::TimeDelta&));
   MOCK_METHOD1(OnSyncProtocolError, void(const sessions::SyncSessionSnapshot&));
@@ skipping 210 matching lines @@
   dcm.set_send_error(false);
   EXPECT_TRUE(SyncerProtoUtil::PostAndProcessHeaders(&dcm, NULL,
       msg, &response));
 
   dcm.set_access_denied(true);
   EXPECT_FALSE(SyncerProtoUtil::PostAndProcessHeaders(&dcm, NULL,
       msg, &response));
 }
 
 TEST_F(SyncerProtoUtilTest, HandleThrottlingWithDatatypes) {
-  MockSyncSessionContext context;
+  ThrottledDataTypeTracker tracker(NULL);
   SyncProtocolError error;
   error.error_type = browser_sync::THROTTLED;
   syncable::ModelTypeSet types;
   types.Put(syncable::BOOKMARKS);
   types.Put(syncable::PASSWORDS);
   error.error_data_types = types;
 
-  base::TimeTicks ticks = base::TimeTicks::Now();
-
-  EXPECT_CALL(context, SetUnthrottleTime(HasModelTypes(types), ticks));
-
-  SyncerProtoUtil::HandleThrottleError(error, ticks, &context, NULL);
+  base::TimeTicks ticks = base::TimeTicks::FromInternalValue(1);
+  SyncerProtoUtil::HandleThrottleError(error, ticks, &tracker, NULL);
+  EXPECT_TRUE(tracker.GetThrottledTypes().Equals(types));
 }
 
 TEST_F(SyncerProtoUtilTest, HandleThrottlingNoDatatypes) {
+  ThrottledDataTypeTracker tracker(NULL);
   MockDelegate delegate;
   SyncProtocolError error;
   error.error_type = browser_sync::THROTTLED;
 
-  base::TimeTicks ticks = base::TimeTicks::Now();
+  base::TimeTicks ticks = base::TimeTicks::FromInternalValue(1);
 
   EXPECT_CALL(delegate, OnSilencedUntil(ticks));
 
-  SyncerProtoUtil::HandleThrottleError(error, ticks, NULL, &delegate);
+  SyncerProtoUtil::HandleThrottleError(error, ticks, &tracker, &delegate);
+  EXPECT_TRUE(tracker.GetThrottledTypes().Empty());
 }
 }  // namespace browser_sync