Fix WebRTC transport to normalize SDP messages.

remoting/protocol/webrtc_transport_unittest.cc

 // Copyright 2015 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 "remoting/protocol/webrtc_transport.h"
 
 #include <utility>
 
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
+#include "base/strings/string_util.h"
 #include "jingle/glue/thread_wrapper.h"
 #include "net/base/io_buffer.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "remoting/protocol/connection_tester.h"
 #include "remoting/protocol/fake_authenticator.h"
 #include "remoting/protocol/message_channel_factory.h"
 #include "remoting/protocol/message_pipe.h"
 #include "remoting/protocol/network_settings.h"
 #include "remoting/protocol/transport_context.h"
 #include "remoting/signaling/fake_signal_strategy.h"
@@ skipping 65 matching lines @@
   void TearDown() override {
     run_loop_.reset();
     client_message_pipe_.reset();
     client_transport_.reset();
     host_message_pipe_.reset();
     host_transport_.reset();
     base::RunLoop().RunUntilIdle();
   }
 
   void ProcessTransportInfo(scoped_ptr<WebrtcTransport>* target_transport,
+                            bool normalize_line_endings,
                             scoped_ptr<buzz::XmlElement> transport_info) {
     ASSERT_TRUE(target_transport);
+
+    // Reformat the message to normalize line endings by removing CR symbol.
+    if (normalize_line_endings) {
+      std::string xml = transport_info->Str();
+      base::ReplaceChars(xml, "\r", std::string(), &xml);
+      transport_info.reset(buzz::XmlElement::ForStr(xml));
+    }
+
     EXPECT_TRUE(
         (*target_transport)->ProcessTransportInfo(transport_info.get()));
   }
 
   void InitializeConnection() {
     host_transport_.reset(
         new WebrtcTransport(jingle_glue::JingleThreadWrapper::current(),
                             TransportContext::ForTests(TransportRole::SERVER),
                             &host_event_handler_));
     host_authenticator_.reset(new FakeAuthenticator(
@@ skipping 17 matching lines @@
         base::Bind(&WebrtcTransportTest::OnSessionError, base::Unretained(this),
                    TransportRole::SERVER));
     client_event_handler_.set_error_callback(
         base::Bind(&WebrtcTransportTest::OnSessionError, base::Unretained(this),
                    TransportRole::CLIENT));
 
     // Start both transports.
     host_transport_->Start(
         host_authenticator_.get(),
         base::Bind(&WebrtcTransportTest::ProcessTransportInfo,
-                   base::Unretained(this), &client_transport_));
+                   base::Unretained(this), &client_transport_, true));
     client_transport_->Start(
         client_authenticator_.get(),
         base::Bind(&WebrtcTransportTest::ProcessTransportInfo,
-                   base::Unretained(this), &host_transport_));
+                   base::Unretained(this), &host_transport_, false));
   }
 
   void WaitUntilConnected() {
     int counter = 2;
     host_event_handler_.set_connected_callback(
         base::Bind(&WebrtcTransportTest::QuitRunLoopOnCounter,
                    base::Unretained(this), &counter));
     client_event_handler_.set_connected_callback(
         base::Bind(&WebrtcTransportTest::QuitRunLoopOnCounter,
                    base::Unretained(this), &counter));
@@ skipping 158 matching lines @@
   run_loop_.reset(new base::RunLoop());
   run_loop_->Run();
 
   // Check that OnSessionError() has been called.
   EXPECT_EQ(CHANNEL_CONNECTION_ERROR, host_error_);
   EXPECT_FALSE(host_transport_);
 }
 
 }  // namespace protocol
 }  // namespace remoting