Update webrtc&libjingle 6774:6825.

jingle/notifier/communicator/login_settings.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 <string>
 
 #include "jingle/notifier/communicator/login_settings.h"
 
 #include "base/logging.h"
 #include "jingle/notifier/base/server_information.h"
 #include "net/cert/cert_verifier.h"
-#include "talk/base/common.h"
-#include "talk/base/socketaddress.h"
+#include "webrtc/base/common.h"
+#include "webrtc/base/socketaddress.h"
 
 namespace notifier {
 
 LoginSettings::LoginSettings(const buzz::XmppClientSettings& user_settings,
                              const scoped_refptr<net::URLRequestContextGetter>&
                                  request_context_getter,
                              const ServerList& default_servers,
                              bool try_ssltcp_first,
                              const std::string& auth_mechanism)
     : user_settings_(user_settings),
@@ skipping 39 matching lines @@
 }
 
 ServerList LoginSettings::GetServersForTime(base::Time now) const {
   return
       (now < redirect_expiration_) ?
       ServerList(1, redirect_server_) :
       default_servers_;
 }
 
 }  // namespace notifier