Use Authenticator interface in Session and SessionManager

remoting/protocol/content_description.h

Index: remoting/protocol/content_description.h
diff --git a/remoting/protocol/content_description.h b/remoting/protocol/content_description.h
index 5e4053fce3536ba3bb114324e4a48cf06373ce53..95ccf60566367df2d5a78d57688ffbe807279aea 100644
--- a/remoting/protocol/content_description.h
+++ b/remoting/protocol/content_description.h
@@ -28,17 +28,18 @@ class ContentDescription : public cricket::ContentDescription {
  public:
   static const char kChromotingContentName[];
 
+  // Takes ownership of |config| and |authenticator_message|.
   ContentDescription(const CandidateSessionConfig* config,
-                     const std::string& auth_token,
-                     const std::string& certificate);
+                     const buzz::XmlElement* authenticator_message);
   virtual ~ContentDescription();
 
   const CandidateSessionConfig* config() const {
     return candidate_config_.get();
   }
 
-  const std::string& auth_token() const { return auth_token_; }
-  const std::string& certificate() const { return certificate_; }
+  const buzz::XmlElement* authenticator_message() const {
+    return authenticator_message_.get();
+  }
 
   buzz::XmlElement* ToXml() const;
 
@@ -46,12 +47,7 @@ class ContentDescription : public cricket::ContentDescription {
 
  private:
   scoped_ptr<const CandidateSessionConfig> candidate_config_;
-
-  // This may contain the initiating, or the accepting token depending on
-  // context.
-  std::string auth_token_;
-
-  std::string certificate_;
+  scoped_ptr<const buzz::XmlElement> authenticator_message_;
 };
 
 }  // namespace protocol