Revert of Revert "[Mac] Reland r276808 Use a native MessagePump instead of a MessagePumpDefault"

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"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
+#include "base/message_loop/message_pump_default.h"
 #include "jingle/glue/mock_task.h"
 #include "jingle/glue/task_pump.h"
 #include "jingle/notifier/base/weak_xmpp_client.h"
 #include "net/cert/cert_verifier.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_test_util.h"
 #include "talk/xmpp/prexmppauth.h"
 #include "talk/xmpp/xmppclientsettings.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 43 matching lines @@
   virtual ~MockXmppConnectionDelegate() {}
 
   MOCK_METHOD1(OnConnect, void(base::WeakPtr<buzz::XmppTaskParentInterface>));
   MOCK_METHOD3(OnError,
                void(buzz::XmppEngine::Error, int, const buzz::XmlElement*));
 };
 
 class XmppConnectionTest : public testing::Test {
  protected:
   XmppConnectionTest()
-      : mock_pre_xmpp_auth_(new MockPreXmppAuth()),
-        url_request_context_getter_(new net::TestURLRequestContextGetter(
-            message_loop_.message_loop_proxy())) {}
+      : mock_pre_xmpp_auth_(new MockPreXmppAuth()) {
+    scoped_ptr<base::MessagePump> pump(new base::MessagePumpDefault());
+    message_loop_.reset(new base::MessageLoop(pump.Pass()));
+
+    url_request_context_getter_ = new net::TestURLRequestContextGetter(
+        message_loop_->message_loop_proxy());
+  }
 
   virtual ~XmppConnectionTest() {}
 
   virtual void TearDown() {
     // Clear out any messages posted by XmppConnection's destructor.
-    message_loop_.RunUntilIdle();
+    message_loop_->RunUntilIdle();
   }
 
   // Needed by XmppConnection.
-  base::MessageLoop message_loop_;
+  scoped_ptr<base::MessageLoop> message_loop_;
   MockXmppConnectionDelegate mock_xmpp_connection_delegate_;
   scoped_ptr<MockPreXmppAuth> mock_pre_xmpp_auth_;
   scoped_refptr<net::TestURLRequestContextGetter> url_request_context_getter_;
 };
 
 TEST_F(XmppConnectionTest, CreateDestroy) {
   XmppConnection xmpp_connection(buzz::XmppClientSettings(),
                                  url_request_context_getter_,
                                  &mock_xmpp_connection_delegate_, NULL);
 }
 
 #if !defined(_MSC_VER) || _MSC_VER < 1700 // http://crbug.com/158570
 TEST_F(XmppConnectionTest, ImmediateFailure) {
   // ChromeAsyncSocket::Connect() will always return false since we're
   // not setting a valid host, but this gets bubbled up as ERROR_NONE
   // due to XmppClient's inconsistent error-handling.
   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);
 
   // We need to do this *before* |xmpp_connection| gets destroyed or
   // our delegate won't be called.
-  message_loop_.RunUntilIdle();
+  message_loop_->RunUntilIdle();
 }
 
 TEST_F(XmppConnectionTest, PreAuthFailure) {
   EXPECT_CALL(*mock_pre_xmpp_auth_, StartPreXmppAuth(_, _, _, _,_));
   EXPECT_CALL(*mock_pre_xmpp_auth_, IsAuthDone()).WillOnce(Return(true));
   EXPECT_CALL(*mock_pre_xmpp_auth_, IsAuthorized()).WillOnce(Return(false));
   EXPECT_CALL(*mock_pre_xmpp_auth_, HadError()).WillOnce(Return(true));
   EXPECT_CALL(*mock_pre_xmpp_auth_, GetError()).WillOnce(Return(5));
 
   EXPECT_CALL(mock_xmpp_connection_delegate_,
               OnError(buzz::XmppEngine::ERROR_AUTH, 5, NULL));
 
   XmppConnection xmpp_connection(
       buzz::XmppClientSettings(), url_request_context_getter_,
       &mock_xmpp_connection_delegate_, mock_pre_xmpp_auth_.release());
 
   // We need to do this *before* |xmpp_connection| gets destroyed or
   // our delegate won't be called.
-  message_loop_.RunUntilIdle();
+  message_loop_->RunUntilIdle();
 }
 
 TEST_F(XmppConnectionTest, FailureAfterPreAuth) {
   EXPECT_CALL(*mock_pre_xmpp_auth_, StartPreXmppAuth(_, _, _, _,_));
   EXPECT_CALL(*mock_pre_xmpp_auth_, IsAuthDone()).WillOnce(Return(true));
   EXPECT_CALL(*mock_pre_xmpp_auth_, IsAuthorized()).WillOnce(Return(true));
   EXPECT_CALL(*mock_pre_xmpp_auth_, GetAuthMechanism()).WillOnce(Return(""));
   EXPECT_CALL(*mock_pre_xmpp_auth_, GetAuthToken()).WillOnce(Return(""));
 
   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_, mock_pre_xmpp_auth_.release());
 
   // We need to do this *before* |xmpp_connection| gets destroyed or
   // our delegate won't be called.
-  message_loop_.RunUntilIdle();
+  message_loop_->RunUntilIdle();
 }
 
 TEST_F(XmppConnectionTest, RaisedError) {
   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);
 
@@ skipping 76 matching lines @@
     // We have to do this since the state enum is protected in
     // talk_base::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();
+  message_loop_->RunUntilIdle();
 }
 
 }  // namespace notifier