| 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 4598588729386e3ee2b5c2766387cf6c7864c37d..f84b8b7fec9fddb88ed811adef8536076740611e 100644
|
| --- a/chrome/browser/sync/engine/net/server_connection_manager.cc
|
| +++ b/chrome/browser/sync/engine/net/server_connection_manager.cc
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2010 The Chromium Authors. All rights reserved.
|
| +// 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.
|
|
|
| @@ -158,16 +158,8 @@ ServerConnectionManager::~ServerConnectionManager() {
|
| }
|
|
|
| void ServerConnectionManager::NotifyStatusChanged() {
|
| - if (CommandLine::ForCurrentProcess()->HasSwitch(
|
| - switches::kNewSyncerThread)) {
|
| - listeners_->Notify(&ServerConnectionEventListener::OnServerConnectionEvent,
|
| - ServerConnectionEvent2(server_status_, server_reachable_));
|
| - } else {
|
| - ServerConnectionEvent event = { ServerConnectionEvent::STATUS_CHANGED,
|
| - server_status_,
|
| - server_reachable_ };
|
| - channel_->NotifyListeners(event);
|
| - }
|
| + listeners_->Notify(&ServerConnectionEventListener::OnServerConnectionEvent,
|
| + ServerConnectionEvent2(server_status_, server_reachable_));
|
| }
|
|
|
| bool ServerConnectionManager::PostBufferWithCachedAuth(
|
|
|