Unplumb AllStatus from SyncerThread.

chrome/browser/sync/engine/all_status.cc

 // Copyright (c) 2006-2009 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 "chrome/browser/sync/engine/all_status.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/port.h"
-#include "base/rand_util.h"
 #include "chrome/browser/sync/engine/auth_watcher.h"
 #include "chrome/browser/sync/engine/net/server_connection_manager.h"
 #include "chrome/browser/sync/engine/syncer.h"
 #include "chrome/browser/sync/engine/syncer_thread.h"
 #include "chrome/browser/sync/protocol/service_constants.h"
 #include "chrome/browser/sync/sessions/session_state.h"
 #include "chrome/browser/sync/syncable/directory_manager.h"
 #include "chrome/common/deprecated/event_sys-inl.h"
 #include "jingle/notifier/listener/talk_mediator.h"
 
 namespace browser_sync {
 
 static const time_t kMinSyncObserveInterval = 10;  // seconds
 
-// Backoff interval randomization factor.
-static const int kBackoffRandomizationFactor = 2;
-
-const int AllStatus::kMaxBackoffSeconds = 60 * 60 * 4;  // 4 hours.
-
 const char* AllStatus::GetSyncStatusString(SyncStatus icon) {
   const char* strings[] = {"OFFLINE", "OFFLINE_UNSYNCED", "SYNCING", "READY",
       "CONFLICT", "OFFLINE_UNUSABLE"};
   COMPILE_ASSERT(arraysize(strings) == ICON_STATUS_COUNT, enum_indexed_array);
   if (icon < 0 || icon >= static_cast<SyncStatus>(arraysize(strings)))
     LOG(FATAL) << "Illegal Icon State:" << icon;
   return strings[icon];
 }
 
 static const AllStatus::Status init_status =
@@ skipping 188 matching lines @@
     status_.server_up = IsGoodReplyFromServer(event.connection_code);
     status_.server_reachable = event.server_reachable;
   }
 }
 
 AllStatus::Status AllStatus::status() const {
   AutoLock lock(mutex_);
   return status_;
 }
 
-int AllStatus::GetRecommendedDelaySeconds(int base_delay_seconds) {
-  if (base_delay_seconds >= kMaxBackoffSeconds)
-    return kMaxBackoffSeconds;
-
-  // This calculates approx. base_delay_seconds * 2 +/- base_delay_seconds / 2
-  int backoff_s = (0 == base_delay_seconds) ? 1 :
-      base_delay_seconds * kBackoffRandomizationFactor;
-
-  // Flip a coin to randomize backoff interval by +/- 50%.
-  int rand_sign = base::RandInt(0, 1) * 2 - 1;
-
-  // Truncation is adequate for rounding here.
-  backoff_s = backoff_s +
-      (rand_sign * (base_delay_seconds / kBackoffRandomizationFactor));
-
-  // Cap the backoff interval.
-  backoff_s = std::min(backoff_s, kMaxBackoffSeconds);
-
-  return backoff_s;
-}
-
-int AllStatus::GetRecommendedDelay(int base_delay_ms) const {
-  return GetRecommendedDelaySeconds(base_delay_ms / 1000) * 1000;
-}
-
 void AllStatus::SetNotificationsEnabled(bool notifications_enabled) {
   ScopedStatusLockWithNotify lock(this);
   status_.notifications_enabled = notifications_enabled;
 }
 
 void AllStatus::IncrementNotificationsSent() {
   ScopedStatusLockWithNotify lock(this);
   ++status_.notifications_sent;
 }
 
@@ skipping 18 matching lines @@
   allstatus_->mutex_.Release();
   if (event_.what_changed)
     allstatus_->channel()->NotifyListeners(event_);
 }
 
 void ScopedStatusLockWithNotify::NotifyOverQuota() {
   event_.what_changed |= AllStatusEvent::OVER_QUOTA;
 }
 
 }  // namespace browser_sync