| Index: chrome/browser/sync/engine/net/server_connection_manager.cc
|
| diff --git a/chrome/browser/sync/engine/net/server_connection_manager.cc b/chrome/browser/sync/engine/net/server_connection_manager.cc
|
| index bceb18713f1e6e192b78d169917e8f2cdb6e9edd..b0d7c2fddd98858922dbc110c8c9ab109f7f0b6f 100644
|
| --- a/chrome/browser/sync/engine/net/server_connection_manager.cc
|
| +++ b/chrome/browser/sync/engine/net/server_connection_manager.cc
|
| @@ -180,7 +180,6 @@ ServerConnectionManager::ServerConnectionManager(
|
| use_ssl_(use_ssl),
|
| proto_sync_path_(kSyncServerSyncPath),
|
| get_time_path_(kSyncServerGetTimePath),
|
| - error_count_(0),
|
| server_status_(HttpResponse::NONE),
|
| server_reachable_(false),
|
| terminated_(false),
|
| @@ -252,14 +251,11 @@ bool ServerConnectionManager::PostBufferToPath(PostBufferParams* params,
|
| bool ok = post.get()->Init(
|
| path.c_str(), auth_token, params->buffer_in, ¶ms->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(
|
| ¶ms->buffer_out, ¶ms->response, true)) {
|
| @@ -311,7 +307,6 @@ bool ServerConnectionManager::CheckTime(int32* out_time) {
|
| VLOG(1) << "Server was reachable.";
|
| return true;
|
| }
|
| - IncrementErrorCount();
|
| return false;
|
| }
|
|
|
| @@ -336,25 +331,6 @@ bool ServerConnectionManager::CheckServerReachable() {
|
| 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) {
|
|
|