Revert 146262 - Revert "Revert 142517 - [Sync] Refactor sync configuration logic."

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/sync_scheduler.h"
 #include "sync/engine/throttled_data_type_tracker.h"
 #include "sync/sessions/sync_session_context.h"
 #include "sync/sessions/test_util.h"
@@ skipping 89 matching lines @@
     ResetWaitInterval();
     SetLastSyncedTime(base::TimeTicks::Now());
   }
 
   SyncScheduler::JobProcessDecision CreateAndDecideJob(
       SyncScheduler::SyncSessionJob::SyncSessionJobPurpose purpose) {
     SyncSession* s = scheduler_->CreateSyncSession(SyncSourceInfo());
     SyncScheduler::SyncSessionJob job(purpose, TimeTicks::Now(),
          make_linked_ptr(s),
          false,
-         ConfigurationParams(),
          FROM_HERE);
     return DecideOnJob(job);
   }
 
   SyncSessionContext* context() { return context_.get(); }
 
  private:
   MessageLoop message_loop_;
   scoped_ptr<MockConnectionManager> connection_;
   scoped_ptr<SyncSessionContext> context_;
@@ skipping 33 matching lines @@
   types_with_payload[syncer::BOOKMARKS] = "";
 
   SyncSourceInfo info(GetUpdatesCallerInfo::LOCAL, types_with_payload);
   SyncSession* s = scheduler_->CreateSyncSession(info);
 
   // Now schedule a nudge with just bookmarks and the change is local.
   SyncScheduler::SyncSessionJob job(SyncScheduler::SyncSessionJob::NUDGE,
                                     TimeTicks::Now(),
                                     make_linked_ptr(s),
                                     false,
-                                    ConfigurationParams(),
                                     FROM_HERE);
 
   SyncScheduler::JobProcessDecision decision = DecideOnJob(job);
   EXPECT_EQ(decision, SyncScheduler::SAVE);
 }
 
 TEST_F(SyncSchedulerWhiteboxTest, ContinueNudge) {
   InitializeSyncerOnNormalMode();
 
   SyncScheduler::JobProcessDecision decision = CreateAndDecideJob(
@@ skipping 86 matching lines @@
   struct SyncScheduler::SyncSessionJob job;
   job.purpose = SyncScheduler::SyncSessionJob::CONFIGURATION;
   job.scheduled_start = TimeTicks::Now();
   job.is_canary_job = true;
   SyncScheduler::JobProcessDecision decision = DecideOnJob(job);
 
   EXPECT_EQ(decision, SyncScheduler::CONTINUE);
 }
 
 }  // namespace syncer