[Sync] //components/sync internal changes [DO NOT SUBMIT]

components/sync/engine_impl/backoff_delay_provider.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/engine/backoff_delay_provider.h"
+#include "components/sync/engine_impl/backoff_delay_provider.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 
 #include "base/rand_util.h"
-#include "sync/internal_api/public/engine/polling_constants.h"
-#include "sync/internal_api/public/sessions/model_neutral_state.h"
-#include "sync/internal_api/public/util/syncer_error.h"
+#include "components/sync/base/syncer_error.h"
+#include "components/sync/engine/polling_constants.h"
+#include "components/sync/sessions/model_neutral_state.h"
 
 using base::TimeDelta;
 
 namespace syncer {
 
 // static
 BackoffDelayProvider* BackoffDelayProvider::FromDefaults() {
   return new BackoffDelayProvider(
       TimeDelta::FromSeconds(kInitialBackoffRetrySeconds),
       TimeDelta::FromSeconds(kInitialBackoffImmediateRetrySeconds));
 }
 
 // static
 BackoffDelayProvider* BackoffDelayProvider::WithShortInitialRetryOverride() {
   return new BackoffDelayProvider(
       TimeDelta::FromSeconds(kInitialBackoffShortRetrySeconds),
       TimeDelta::FromSeconds(kInitialBackoffImmediateRetrySeconds));
 }
 
 BackoffDelayProvider::BackoffDelayProvider(
     const base::TimeDelta& default_initial_backoff,
     const base::TimeDelta& short_initial_backoff)
     : default_initial_backoff_(default_initial_backoff),
-      short_initial_backoff_(short_initial_backoff) {
-}
+      short_initial_backoff_(short_initial_backoff) {}
 
 BackoffDelayProvider::~BackoffDelayProvider() {}
 
 TimeDelta BackoffDelayProvider::GetDelay(const base::TimeDelta& last_delay) {
   if (last_delay.InSeconds() >= kMaxBackoffSeconds)
     return TimeDelta::FromSeconds(kMaxBackoffSeconds);
 
   // This calculates approx. base_delay_seconds * 2 +/- base_delay_seconds / 2
   int64_t backoff_s =
       std::max(static_cast<int64_t>(1),
                last_delay.InSeconds() * 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 +
+  backoff_s =
+      backoff_s +
       (rand_sign * (last_delay.InSeconds() / kBackoffRandomizationFactor));
 
   // Cap the backoff interval.
   backoff_s = std::max(static_cast<int64_t>(1),
                        std::min(backoff_s, kMaxBackoffSeconds));
 
   return TimeDelta::FromSeconds(backoff_s);
 }
 
 TimeDelta BackoffDelayProvider::GetInitialDelay(
@@ skipping 33 matching lines @@
   // TODO(sync): We shouldn't need to handle this in BackoffDelayProvider.
   // There should be a way to deal with protocol errors before we get to this
   // point.
   if (state.commit_result == SERVER_RETURN_CONFLICT)
     return short_initial_backoff_;
 
   return default_initial_backoff_;
 }
 
 }  // namespace syncer