Update webrtc&libjingle 6774:6825.

jingle/notifier/base/xmpp_connection_unittest.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 "jingle/notifier/base/xmpp_connection.h"
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 10 matching lines @@
 #include "talk/xmpp/prexmppauth.h"
 #include "talk/xmpp/xmppclientsettings.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace buzz {
 class CaptchaChallenge;
 class Jid;
 }  // namespace buzz
 
-namespace talk_base {
+namespace rtc {
 class CryptString;
 class SocketAddress;
 class Task;
-}  // namespace talk_base
+}  // namespace rtc
 
 namespace notifier {
 
 using ::testing::_;
 using ::testing::Return;
 using ::testing::SaveArg;
 
 class MockPreXmppAuth : public buzz::PreXmppAuth {
  public:
   virtual ~MockPreXmppAuth() {}
 
   MOCK_METHOD2(ChooseBestSaslMechanism,
                std::string(const std::vector<std::string>&, bool));
   MOCK_METHOD1(CreateSaslMechanism,
                buzz::SaslMechanism*(const std::string&));
   MOCK_METHOD5(StartPreXmppAuth,
                void(const buzz::Jid&,
-                    const talk_base::SocketAddress&,
-                    const talk_base::CryptString&,
+                    const rtc::SocketAddress&,
+                    const rtc::CryptString&,
                     const std::string&,
                     const std::string&));
   MOCK_CONST_METHOD0(IsAuthDone, bool());
   MOCK_CONST_METHOD0(IsAuthorized, bool());
   MOCK_CONST_METHOD0(HadError, bool());
   MOCK_CONST_METHOD0(GetError, int());
   MOCK_CONST_METHOD0(GetCaptchaChallenge, buzz::CaptchaChallenge());
   MOCK_CONST_METHOD0(GetAuthToken, std::string());
   MOCK_CONST_METHOD0(GetAuthMechanism, std::string());
 };
@@ skipping 100 matching lines @@
   XmppConnection xmpp_connection(buzz::XmppClientSettings(),
                                  url_request_context_getter_,
                                  &mock_xmpp_connection_delegate_, NULL);
 
   xmpp_connection.weak_xmpp_client_->
       SignalStateChange(buzz::XmppEngine::STATE_CLOSED);
 }
 #endif
 
 TEST_F(XmppConnectionTest, Connect) {
-  base::WeakPtr<talk_base::Task> weak_ptr;
+  base::WeakPtr<rtc::Task> weak_ptr;
   EXPECT_CALL(mock_xmpp_connection_delegate_, OnConnect(_)).
       WillOnce(SaveArg<0>(&weak_ptr));
 
   {
     XmppConnection xmpp_connection(buzz::XmppClientSettings(),
                                    url_request_context_getter_,
                                    &mock_xmpp_connection_delegate_, NULL);
 
     xmpp_connection.weak_xmpp_client_->
         SignalStateChange(buzz::XmppEngine::STATE_OPEN);
     EXPECT_EQ(xmpp_connection.weak_xmpp_client_.get(), weak_ptr.get());
   }
 
   EXPECT_EQ(NULL, weak_ptr.get());
 }
 
 TEST_F(XmppConnectionTest, MultipleConnect) {
   EXPECT_DEBUG_DEATH({
-    base::WeakPtr<talk_base::Task> weak_ptr;
+    base::WeakPtr<rtc::Task> weak_ptr;
     EXPECT_CALL(mock_xmpp_connection_delegate_, OnConnect(_)).
         WillOnce(SaveArg<0>(&weak_ptr));
 
     XmppConnection xmpp_connection(buzz::XmppClientSettings(),
                                    url_request_context_getter_,
                                    &mock_xmpp_connection_delegate_, NULL);
 
     xmpp_connection.weak_xmpp_client_->
         SignalStateChange(buzz::XmppEngine::STATE_OPEN);
     for (int i = 0; i < 3; ++i) {
       xmpp_connection.weak_xmpp_client_->
           SignalStateChange(buzz::XmppEngine::STATE_OPEN);
     }
 
     EXPECT_EQ(xmpp_connection.weak_xmpp_client_.get(), weak_ptr.get());
   }, "more than once");
 }
 
 #if !defined(_MSC_VER) || _MSC_VER < 1700 // http://crbug.com/158570
 TEST_F(XmppConnectionTest, ConnectThenError) {
-  base::WeakPtr<talk_base::Task> weak_ptr;
+  base::WeakPtr<rtc::Task> weak_ptr;
   EXPECT_CALL(mock_xmpp_connection_delegate_, OnConnect(_)).
       WillOnce(SaveArg<0>(&weak_ptr));
   EXPECT_CALL(mock_xmpp_connection_delegate_,
               OnError(buzz::XmppEngine::ERROR_NONE, 0, NULL));
 
   XmppConnection xmpp_connection(buzz::XmppClientSettings(),
                                  url_request_context_getter_,
                                  &mock_xmpp_connection_delegate_, NULL);
 
   xmpp_connection.weak_xmpp_client_->
@@ skipping 10 matching lines @@
 // should still not run any more tasks.
 TEST_F(XmppConnectionTest, TasksDontRunAfterXmppConnectionDestructor) {
   {
     XmppConnection xmpp_connection(buzz::XmppClientSettings(),
                                    url_request_context_getter_,
                                    &mock_xmpp_connection_delegate_, NULL);
 
     jingle_glue::MockTask* task =
         new jingle_glue::MockTask(xmpp_connection.task_pump_.get());
     // We have to do this since the state enum is protected in
-    // talk_base::Task.
+    // rtc::Task.
     const int TASK_STATE_ERROR = 3;
     ON_CALL(*task, ProcessStart())
         .WillByDefault(Return(TASK_STATE_ERROR));
     EXPECT_CALL(*task, ProcessStart()).Times(0);
     task->Start();
   }
 
   // This should destroy |task_pump|, but |task| still shouldn't run.
   message_loop_->RunUntilIdle();
 }
 
 }  // namespace notifier