Roll WebRTC 7546:7549.

remoting/protocol/content_description.h

 // 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.
 
 #ifndef REMOTING_PROTOCOL_CONTENT_DESCRIPTION_H_
 #define REMOTING_PROTOCOL_CONTENT_DESCRIPTION_H_
 
 #include <string>
 
+#include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/memory/ref_counted.h"
 #include "remoting/protocol/session_config.h"
-#include "third_party/libjingle/source/talk/p2p/base/sessiondescription.h"
+#include "third_party/webrtc/p2p/base/sessiondescription.h"
 
 namespace buzz {
 class XmlElement;
 }  // namespace buzz
 
 namespace remoting {
 namespace protocol {
 
 // ContentDescription used for chromoting sessions. It contains the information
 // from the content description stanza in the session intialization handshake.
@@ skipping 31 matching lines @@
                                   const char tag_name[],
                                   bool codec_required,
                                   bool optional,
                                   std::list<ChannelConfig>* const configs);
 };
 
 }  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_CONTENT_DESCRIPTION_H_