[Sync] Have bookmarks use a slower nudge delay to better handle automated writes

sync/internal_api/sync_manager_impl.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/internal_api/sync_manager_impl.h"
 
 #include <string>
 
 #include "base/base64.h"
 #include "base/bind.h"
@@ skipping 45 matching lines @@
 
 using sessions::SyncSessionContext;
 using syncable::ImmutableWriteTransactionInfo;
 using syncable::SPECIFICS;
 using syncable::UNIQUE_POSITION;
 
 namespace {
 
 // Delays for syncer nudges.
 static const int kDefaultNudgeDelayMilliseconds = 200;
-static const int kPreferencesNudgeDelayMilliseconds = 2000;
+static const int kSlowNudgeDelayMilliseconds = 2000;
 static const int kSyncRefreshDelayMsec = 500;
 static const int kSyncSchedulerDelayMsec = 250;
 
 GetUpdatesCallerInfo::GetUpdatesSource GetSourceFromReason(
     ConfigureReason reason) {
   switch (reason) {
     case CONFIGURE_REASON_RECONFIGURATION:
       return GetUpdatesCallerInfo::RECONFIGURATION;
     case CONFIGURE_REASON_MIGRATION:
       return GetUpdatesCallerInfo::MIGRATION;
@@ skipping 36 matching lines @@
 
     // The datatype does not use one of the predefined wait times but defines
     // its own wait time logic for nudge.
     CUSTOM,
   };
 
   static NudgeDelayStrategy GetNudgeDelayStrategy(const ModelType& type) {
     switch (type) {
      case AUTOFILL:
        return ACCOMPANY_ONLY;
+     case BOOKMARKS:
      case PREFERENCES:
      case SESSIONS:
      case FAVICON_IMAGES:
      case FAVICON_TRACKING:
        return CUSTOM;
      default:
        return IMMEDIATE;
     }
   }
 
   static TimeDelta GetNudgeDelayTimeDeltaFromType(
       const NudgeDelayStrategy& delay_type, const ModelType& model_type,
       const SyncManagerImpl* core) {
     CHECK(core);
     TimeDelta delay = TimeDelta::FromMilliseconds(
        kDefaultNudgeDelayMilliseconds);
     switch (delay_type) {
      case IMMEDIATE:
        delay = TimeDelta::FromMilliseconds(
            kDefaultNudgeDelayMilliseconds);
        break;
      case ACCOMPANY_ONLY:
        delay = TimeDelta::FromSeconds(kDefaultShortPollIntervalSeconds);
        break;
      case CUSTOM:
        switch (model_type) {
+         case BOOKMARKS:
          case PREFERENCES:
-           delay = TimeDelta::FromMilliseconds(
-               kPreferencesNudgeDelayMilliseconds);
+           delay = TimeDelta::FromMilliseconds(kSlowNudgeDelayMilliseconds);
            break;
          case SESSIONS:
          case FAVICON_IMAGES:
          case FAVICON_TRACKING:
            delay = core->scheduler()->GetSessionsCommitDelay();
            break;
          default:
            NOTREACHED();
        }
        break;
@@ skipping 980 matching lines @@
 void SyncManagerImpl::RequestEmitDebugInfo() {
   model_type_registry_->RequestEmitDebugInfo();
 }
 
 // static.
 int SyncManagerImpl::GetDefaultNudgeDelay() {
   return kDefaultNudgeDelayMilliseconds;
 }
 
 // static.
-int SyncManagerImpl::GetPreferencesNudgeDelay() {
-  return kPreferencesNudgeDelayMilliseconds;
+int SyncManagerImpl::GetSlowNudgeDelay() {
+  return kSlowNudgeDelayMilliseconds;
 }
 
 }  // namespace syncer