sync: remove IncrementErrorCount from ServerConnectionManager.

chrome/browser/sync/engine/net/server_connection_manager.cc

 // Copyright (c) 2011 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/net/server_connection_manager.h"
 
 #include <errno.h>
 
 #include <ostream>
 #include <string>
@@ skipping 162 matching lines @@
     const string& server,
     int port,
     bool use_ssl,
     const string& user_agent)
     : sync_server_(server),
       sync_server_port_(port),
       user_agent_(user_agent),
       use_ssl_(use_ssl),
       proto_sync_path_(kSyncServerSyncPath),
       get_time_path_(kSyncServerGetTimePath),
-      error_count_(0),
       server_status_(HttpResponse::NONE),
       server_reachable_(false),
       terminated_(false),
       active_connection_(NULL) {
 }
 
 ServerConnectionManager::~ServerConnectionManager() {
 }
 
 ServerConnectionManager::Connection*
@@ skipping 51 matching lines @@
   if (!post.get()) {
     params->response.server_status = HttpResponse::CONNECTION_UNAVAILABLE;
     return false;
   }
 
   // Note that |post| may be aborted by now, which will just cause Init to fail
   // with CONNECTION_UNAVAILABLE.
   bool ok = post.get()->Init(
       path.c_str(), auth_token, params->buffer_in, &params->response);
 
-  if (params->response.server_status == HttpResponse::SYNC_AUTH_ERROR) {
+  if (params->response.server_status == HttpResponse::SYNC_AUTH_ERROR)
     InvalidateAndClearAuthToken();
-  }
 
-  if (!ok || RC_REQUEST_OK != params->response.response_code) {
-    IncrementErrorCount();
+  if (!ok || RC_REQUEST_OK != params->response.response_code)
     return false;
-  }
 
   if (post.get()->ReadBufferResponse(
       &params->buffer_out, &params->response, true)) {
     params->response.server_status = HttpResponse::SERVER_CONNECTION_OK;
     server_reachable_ = true;
     return true;
   }
   return false;
 }
 
@@ skipping 31 matching lines @@
     if (!ok || string::npos !=
         time_response.find_first_not_of("0123456789")) {
       LOG(ERROR) << "unable to read a non-numeric response from get_time:"
             << time_response;
       continue;
     }
     *out_time = atoi(time_response.c_str());
     VLOG(1) << "Server was reachable.";
     return true;
   }
-  IncrementErrorCount();
   return false;
 }
 
 bool ServerConnectionManager::IsServerReachable() {
   DCHECK(thread_checker_.CalledOnValidThread());
   int32 time;
   return CheckTime(&time);
 }
 
 bool ServerConnectionManager::IsUserAuthenticated() {
   DCHECK(thread_checker_.CalledOnValidThread());
   return IsGoodReplyFromServer(server_status_);
 }
 
 bool ServerConnectionManager::CheckServerReachable() {
   DCHECK(thread_checker_.CalledOnValidThread());
   const bool server_is_reachable = IsServerReachable();
   if (server_reachable_ != server_is_reachable) {
     server_reachable_ = server_is_reachable;
     NotifyStatusChanged();
   }
   return server_is_reachable;
 }
 
-bool ServerConnectionManager::IncrementErrorCount() {
-  DCHECK(thread_checker_.CalledOnValidThread());
-  error_count_++;
-
-  if (error_count_ > kMaxConnectionErrorsBeforeReset) {
-    error_count_ = 0;
-
-    if (!IsServerReachable()) {
-      LOG(WARNING) << "Too many connection failures, server is not reachable. "
-                   << "Resetting connections.";
-    } else {
-      LOG(WARNING) << "Multiple connection failures while server is reachable.";
-    }
-    return false;
-  }
-
-  return true;
-}
-
 void ServerConnectionManager::SetServerParameters(const string& server_url,
                                                   int port,
                                                   bool use_ssl) {
   DCHECK(thread_checker_.CalledOnValidThread());
   sync_server_ = server_url;
   sync_server_port_ = port;
   use_ssl_ = use_ssl;
 }
 
 // Returns the current server parameters in server_url and port.
@@ skipping 67 matching lines @@
 }
 
 std::ostream& operator << (std::ostream& s, const struct HttpResponse& hr) {
   s << " Response Code (bogus on error): " << hr.response_code;
   s << " Content-Length (bogus on error): " << hr.content_length;
   s << " Server Status: " << hr.server_status;
   return s;
 }
 
 }  // namespace browser_sync