summaryrefslogtreecommitdiffstats
path: root/remoting/protocol/content_description.h
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-16 00:23:03 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-16 00:23:03 +0000
commit1f528b557f829a838ffa0767a49ce5a55a0b2343 (patch)
tree76d8e3c0f4288e808e0fe939a90c6f9eaadbb451 /remoting/protocol/content_description.h
parentca7c456246121d7e17c22181f0a76eb5c79d3ac0 (diff)
downloadchromium_src-1f528b557f829a838ffa0767a49ce5a55a0b2343.zip
chromium_src-1f528b557f829a838ffa0767a49ce5a55a0b2343.tar.gz
chromium_src-1f528b557f829a838ffa0767a49ce5a55a0b2343.tar.bz2
Don't use X509Certificate in chromoting code.
X509Certificate currently is not usable in sandbox on Mac. Don't use it in chromoting code. BUG=80587 TEST=Unittests Review URL: http://codereview.chromium.org/7401005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92772 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/protocol/content_description.h')
-rw-r--r--remoting/protocol/content_description.h9
1 files changed, 3 insertions, 6 deletions
diff --git a/remoting/protocol/content_description.h b/remoting/protocol/content_description.h
index 3759838..f4cb97b 100644
--- a/remoting/protocol/content_description.h
+++ b/remoting/protocol/content_description.h
@@ -9,7 +9,6 @@
#include "base/memory/scoped_ptr.h"
#include "base/memory/ref_counted.h"
-#include "net/base/x509_certificate.h"
#include "remoting/protocol/session_config.h"
#include "third_party/libjingle/source/talk/p2p/base/sessiondescription.h"
@@ -30,7 +29,7 @@ class ContentDescription : public cricket::ContentDescription {
explicit ContentDescription(const CandidateSessionConfig* config,
const std::string& auth_token,
const std::string& master_key,
- scoped_refptr<net::X509Certificate> certificate);
+ const std::string& certificate);
virtual ~ContentDescription();
const CandidateSessionConfig* config() const {
@@ -39,9 +38,7 @@ class ContentDescription : public cricket::ContentDescription {
const std::string& auth_token() const { return auth_token_; }
const std::string& master_key() const { return master_key_; }
- scoped_refptr<net::X509Certificate> certificate() const {
- return certificate_;
- }
+ const std::string& certificate() const { return certificate_; }
buzz::XmlElement* ToXml() const;
@@ -57,7 +54,7 @@ class ContentDescription : public cricket::ContentDescription {
// Master key used for the session encrypted with the hosts key.
std::string master_key_;
- scoped_refptr<net::X509Certificate> certificate_;
+ std::string certificate_;
};
} // namespace protocol