Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / remoting / host / register_support_host_request_unittest.cc

diff --git a/src/remoting/host/register_support_host_request_unittest.cc b/src/remoting/host/register_support_host_request_unittest.cc
index e4ce866..7f502c9 100644 (file)
--- a/src/remoting/host/register_support_host_request_unittest.cc
+++ b/src/remoting/host/register_support_host_request_unittest.cc
@@ -8,17 +8,18 @@
 #include "base/memory/ref_counted.h"
 #include "base/message_loop/message_loop.h"
 #include "base/observer_list.h"
+#include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "remoting/base/constants.h"
 #include "remoting/base/rsa_key_pair.h"
 #include "remoting/base/test_rsa_key_pair.h"
 #include "remoting/host/in_memory_host_config.h"
-#include "remoting/jingle_glue/iq_sender.h"
-#include "remoting/jingle_glue/mock_objects.h"
+#include "remoting/signaling/iq_sender.h"
+#include "remoting/signaling/mock_signal_strategy.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/libjingle/source/talk/xmllite/xmlelement.h"
 #include "third_party/libjingle/source/talk/xmpp/constants.h"
+#include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
 
 using buzz::QName;
 using buzz::XmlElement;
@@ -92,7 +93,7 @@ TEST_F(RegisterSupportHostRequestTest, Send) {
       .WillOnce(DoAll(SaveArg<0>(&sent_iq), Return(true)));
 
   request->OnSignalStrategyStateChange(SignalStrategy::CONNECTED);
-  message_loop_.RunUntilIdle();
+  base::RunLoop().RunUntilIdle();
 
   // Verify format of the query.
   scoped_ptr<XmlElement> stanza(sent_iq);
@@ -158,7 +159,7 @@ TEST_F(RegisterSupportHostRequestTest, Send) {
   }
   EXPECT_EQ(1, consumed);
 
-  message_loop_.RunUntilIdle();
+  base::RunLoop().RunUntilIdle();
 }
 
 }  // namespace remoting