sync: Handle POLL jobs in separate a code path

sync/engine/sync_scheduler_whitebox_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 "base/message_loop.h"
 #include "base/time.h"
 #include "sync/engine/backoff_delay_provider.h"
 #include "sync/engine/sync_scheduler_impl.h"
 #include "sync/engine/throttled_data_type_tracker.h"
 #include "sync/internal_api/public/engine/polling_constants.h"
@@ skipping 93 matching lines @@
   }
 
   SyncSchedulerImpl::JobProcessDecision CreateAndDecideJob(
       SyncSessionJob::Purpose purpose) {
     scoped_ptr<SyncSession> s(scheduler_->CreateSyncSession(SyncSourceInfo()));
     SyncSessionJob job(purpose, TimeTicks::Now(), s.Pass(),
         ConfigurationParams());
     return DecideOnJob(job, SyncSchedulerImpl::NORMAL_PRIORITY);
   }
 
+  bool ShouldPoll() {
+    return scheduler_->ShouldPoll();
+  }
+
   SyncSessionContext* context() { return context_.get(); }
 
  private:
   MessageLoop message_loop_;
   scoped_ptr<MockConnectionManager> connection_;
   scoped_ptr<SyncSessionContext> context_;
   std::vector<scoped_refptr<FakeModelWorker> > workers_;
   FakeExtensionsActivityMonitor extensions_activity_monitor_;
   scoped_ptr<ThrottledDataTypeTracker> throttled_data_type_tracker_;
   TestDirectorySetterUpper dir_maker_;
@@ skipping 43 matching lines @@
 
 TEST_F(SyncSchedulerWhiteboxTest, ContinueNudge) {
   InitializeSyncerOnNormalMode();
 
   SyncSchedulerImpl::JobProcessDecision decision = CreateAndDecideJob(
       SyncSessionJob::NUDGE);
 
   EXPECT_EQ(decision, SyncSchedulerImpl::CONTINUE);
 }
 
-TEST_F(SyncSchedulerWhiteboxTest, DropPoll) {
-  InitializeSyncerOnNormalMode();
-  SetMode(SyncScheduler::CONFIGURATION_MODE);
-
-  SyncSchedulerImpl::JobProcessDecision decision = CreateAndDecideJob(
-      SyncSessionJob::POLL);
-
-  EXPECT_EQ(decision, SyncSchedulerImpl::DROP);
-}
-
 TEST_F(SyncSchedulerWhiteboxTest, ContinuePoll) {
   InitializeSyncerOnNormalMode();
+  EXPECT_TRUE(ShouldPoll());
+}
 
-  SyncSchedulerImpl::JobProcessDecision decision = CreateAndDecideJob(
-      SyncSessionJob::POLL);
+TEST_F(SyncSchedulerWhiteboxTest, DropPollInConfigureMode) {
+  InitializeSyncerOnNormalMode();
+  SetMode(SyncScheduler::CONFIGURATION_MODE);
+  EXPECT_FALSE(ShouldPoll());
+}
 
-  EXPECT_EQ(decision, SyncSchedulerImpl::CONTINUE);
+TEST_F(SyncSchedulerWhiteboxTest, DropPollWhenThrottled) {
+  InitializeSyncerOnNormalMode();
+  SetWaitIntervalToThrottled();
+  EXPECT_FALSE(ShouldPoll());
+}
+
+TEST_F(SyncSchedulerWhiteboxTest, DropPollInBackoff) {
+  InitializeSyncerOnNormalMode();
+  SetWaitIntervalToExponentialBackoff();
+  EXPECT_FALSE(ShouldPoll());
 }
 
 TEST_F(SyncSchedulerWhiteboxTest, ContinueConfiguration) {
   InitializeSyncerOnNormalMode();
   SetMode(SyncScheduler::CONFIGURATION_MODE);
 
   SyncSchedulerImpl::JobProcessDecision decision = CreateAndDecideJob(
       SyncSessionJob::CONFIGURATION);
 
   EXPECT_EQ(decision, SyncSchedulerImpl::CONTINUE);
@@ skipping 55 matching lines @@
                      TimeTicks::Now(), scoped_ptr<SyncSession>(),
                      ConfigurationParams());
 
   SyncSchedulerImpl::JobProcessDecision decision =
       DecideOnJob(job, SyncSchedulerImpl::CANARY_PRIORITY);
 
   EXPECT_EQ(decision, SyncSchedulerImpl::CONTINUE);
 }
 
 }  // namespace syncer