Merge 185528

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 141 matching lines @@
   SyncSourceInfo info(GetUpdatesCallerInfo::LOCAL, invalidation_map);
   scoped_ptr<SyncSession> s(scheduler_->CreateSyncSession(info));
 
   // Now schedule a nudge with just bookmarks and the change is local.
   SyncSessionJob job(SyncSessionJob::NUDGE,
                      TimeTicks::Now(),
                      s.Pass(),
                      ConfigurationParams(),
                      FROM_HERE);
   SyncSchedulerImpl::JobProcessDecision decision = DecideOnJob(job);
-  EXPECT_EQ(decision, SyncSchedulerImpl::SAVE);
+  // TODO(tim): This shouldn't drop. Bug 177659.
+  EXPECT_EQ(decision, SyncSchedulerImpl::DROP);
 }
 
 TEST_F(SyncSchedulerWhiteboxTest, ContinueNudge) {
   InitializeSyncerOnNormalMode();
 
   SyncSchedulerImpl::JobProcessDecision decision = CreateAndDecideJob(
       SyncSessionJob::NUDGE);
 
   EXPECT_EQ(decision, SyncSchedulerImpl::CONTINUE);
 }
@@ skipping 83 matching lines @@
                      TimeTicks::Now(), scoped_ptr<SyncSession>(),
                      ConfigurationParams(), FROM_HERE);
 
   job.GrantCanaryPrivilege();
   SyncSchedulerImpl::JobProcessDecision decision = DecideOnJob(job);
 
   EXPECT_EQ(decision, SyncSchedulerImpl::CONTINUE);
 }
 
 }  // namespace syncer