Roll WebRTC 7546:7549.

components/invalidation/invalidation_notifier.cc

 // Copyright 2014 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 "components/invalidation/invalidation_notifier.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/metrics/histogram.h"
 #include "components/invalidation/invalidation_handler.h"
 #include "google/cacheinvalidation/include/invalidation-client-factory.h"
 #include "jingle/notifier/listener/push_client.h"
 #include "net/url_request/url_request_context.h"
-#include "talk/xmpp/jid.h"
-#include "talk/xmpp/xmppclientsettings.h"
+#include "webrtc/libjingle/xmpp/jid.h"
+#include "webrtc/libjingle/xmpp/xmppclientsettings.h"
 
 namespace syncer {
 
 InvalidationNotifier::InvalidationNotifier(
     scoped_ptr<SyncNetworkChannel> network_channel,
     const std::string& invalidator_client_id,
     const UnackedInvalidationsMap& saved_invalidations,
     const std::string& invalidation_bootstrap_data,
     const base::WeakPtr<InvalidationStateTracker>& invalidation_state_tracker,
     scoped_refptr<base::SingleThreadTaskRunner>
@@ skipping 64 matching lines @@
   DCHECK(CalledOnValidThread());
   registrar_.DispatchInvalidationsToHandlers(invalidation_map);
 }
 
 void InvalidationNotifier::OnInvalidatorStateChange(InvalidatorState state) {
   DCHECK(CalledOnValidThread());
   registrar_.UpdateInvalidatorState(state);
 }
 
 }  // namespace syncer