[Sync] Replace TalkMediator*/MediatorThread* with PushClient

sync/notifier/invalidation_notifier.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/notifier/invalidation_notifier.h"
 
 #include "base/logging.h"
 #include "base/message_loop_proxy.h"
 #include "jingle/notifier/base/const_communicator.h"
 #include "jingle/notifier/base/notifier_options_util.h"
 #include "net/url_request/url_request_context.h"
 #include "sync/notifier/sync_notifier_observer.h"
-#include "sync/protocol/service_constants.h"
 #include "sync/syncable/model_type_payload_map.h"
 #include "talk/xmpp/jid.h"
 #include "talk/xmpp/xmppclientsettings.h"
 
 namespace sync_notifier {
 
 InvalidationNotifier::InvalidationNotifier(
     const notifier::NotifierOptions& notifier_options,
     const InvalidationVersionMap& initial_max_invalidation_versions,
     const browser_sync::WeakHandle<InvalidationVersionTracker>&
@@ skipping 38 matching lines @@
   invalidation_state_ = state;
   DVLOG(1) << "Setting new state";
 }
 
 void InvalidationNotifier::UpdateCredentials(
     const std::string& email, const std::string& token) {
   DCHECK(non_thread_safe_.CalledOnValidThread());
   CHECK(!invalidation_client_id_.empty());
   DVLOG(1) << "Updating credentials for " << email;
   buzz::XmppClientSettings xmpp_client_settings =
-      notifier::MakeXmppClientSettings(notifier_options_,
-                                       email, token, SYNC_SERVICE_NAME);
+      notifier::MakeXmppClientSettings(notifier_options_, email, token);
   if (state_ >= CONNECTING) {
     login_->UpdateXmppSettings(xmpp_client_settings);
   } else {
     DVLOG(1) << "First time updating credentials: connecting";
     login_.reset(
         new notifier::Login(this,
                             xmpp_client_settings,
                             notifier_options_.request_context_getter,
                             notifier::GetServerList(notifier_options_),
                             notifier_options_.try_ssltcp_first,
@@ skipping 54 matching lines @@
                     OnNotificationStateChange(has_session));
 }
 
 void InvalidationNotifier::WriteState(const std::string& state) {
   DCHECK(non_thread_safe_.CalledOnValidThread());
   DVLOG(1) << "WriteState";
   FOR_EACH_OBSERVER(SyncNotifierObserver, observers_, StoreState(state));
 }
 
 }  // namespace sync_notifier