Roll libjingle to r124 and roll webrtc to 1888.

remoting/protocol/content_description.h

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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/scoped_ptr.h"
 #include "base/memory/ref_counted.h"
@@ skipping 13 matching lines @@
 // This class also provides a type abstraction so that the Chromotocol Session
 // interface does not need to depend on libjingle.
 class ContentDescription : public cricket::ContentDescription {
  public:
   static const char kChromotingContentName[];
 
   ContentDescription(scoped_ptr<CandidateSessionConfig> config,
                      scoped_ptr<buzz::XmlElement> authenticator_message);
   virtual ~ContentDescription();
 
+  virtual ContentDescription* Copy() const OVERRIDE;
+
   const CandidateSessionConfig* config() const {
     return candidate_config_.get();
   }
 
   const buzz::XmlElement* authenticator_message() const {
     return authenticator_message_.get();
   }
 
   buzz::XmlElement* ToXml() const;
 
   static ContentDescription* ParseXml(const buzz::XmlElement* element);
 
  private:
   scoped_ptr<const CandidateSessionConfig> candidate_config_;
   scoped_ptr<const buzz::XmlElement> authenticator_message_;
 };
 
 }  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_CONTENT_DESCRIPTION_H_