Revert of Use standard ICE in Chromoting. (patchset #7 id:160001 of https://codereview.chromium.org/1085703003/)

Reason for revert:
This change did cause test failure: http://build.chromium.org/p/chromium.memory.fyi/builders/Chromium%20Mac%20%28valgrind%29%282%29/builds/34169/ (the link in the first revert was incorrect)

Original issue's description:
> Use standard ICE in Chromoting.
>
> Previously we were using legacy, non-standard version of ICE. This
> change adds ICE version negotiation and enabled standard ICE by default,
> when both peers support it.
>
> BUG=473758
>
> Committed: https://crrev.com/5a5854ee3e1c5760b422f26d31909bfb5dca631f
> Cr-Commit-Position: refs/heads/master@{#326560}

TBR=rmsousa@chromium.org,wez@chromium.org,dcaiafa@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=473758

Review URL: https://codereview.chromium.org/1089253005

Cr-Commit-Position: refs/heads/master@{#326570}

1 files changed, 5 insertions, 2 deletions

diff --git a/remoting/protocol/content_description.h b/remoting/protocol/content_description.h
index f12582f..748b0f9 100644
--- a/remoting/protocol/content_description.h
+++ b/remoting/protocol/content_description.h
@@ -10,6 +10,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "remoting/protocol/session_config.h"
+#include "third_party/webrtc/p2p/base/sessiondescription.h"
 
 namespace buzz {
 class XmlElement;
@@ -23,13 +24,15 @@ namespace protocol {
 //
 // This class also provides a type abstraction so that the Chromotocol Session
 // interface does not need to depend on libjingle.
-class ContentDescription {
+class ContentDescription : public cricket::ContentDescription {
  public:
   static const char kChromotingContentName[];
 
   ContentDescription(scoped_ptr<CandidateSessionConfig> config,
                      scoped_ptr<buzz::XmlElement> authenticator_message);
-  ~ContentDescription();
+  ~ContentDescription() override;
+
+  ContentDescription* Copy() const override;
 
   const CandidateSessionConfig* config() const {
     return candidate_config_.get();