Merge 68891 - [Sync] Fixed sync crash regression in ServerNotifierThread

jingle/notifier/base/fake_base_task.cc

 // Copyright (c) 2010 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.
-//
-// A simple wrapper around invalidation::InvalidationClient that
-// handles all the startup/shutdown details and hookups.
 
-#include "base/message_loop.h"
 #include "jingle/notifier/base/fake_base_task.h"
 #include "jingle/notifier/base/weak_xmpp_client.h"
 #include "talk/xmpp/asyncsocket.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace notifier {
 
 using ::testing::_;
 using ::testing::Return;
 
@@ skipping 16 matching lines @@
   notifier::WeakXmppClient* weak_xmpp_client =
       new notifier::WeakXmppClient(&task_pump_);
 
   weak_xmpp_client->Start();
   buzz::XmppClientSettings settings;
   // Owned by |weak_xmpp_client|.
   MockAsyncSocket* mock_async_socket = new MockAsyncSocket();
   EXPECT_CALL(*mock_async_socket, Connect(_)).WillOnce(Return(true));
   weak_xmpp_client->Connect(settings, "en", mock_async_socket, NULL);
   // Initialize the XMPP client.
-  MessageLoop::current()->RunAllPending();
+  task_pump_.RunTasks();
 
   base_task_ = weak_xmpp_client->AsWeakPtr();
 }
 
 base::WeakPtr<talk_base::Task> FakeBaseTask::AsWeakPtr() {
   return base_task_;
 }
 
 }  // namespace notifier