summaryrefslogtreecommitdiffstats
path: root/remoting/protocol/jingle_session_manager.h
diff options
context:
space:
mode:
authorrvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-14 17:37:14 +0000
committerrvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-14 17:37:14 +0000
commit4b559b4ddffc0b7f688019bcb80658f05e063af7 (patch)
tree0be21d8914de707f5125d2cb66733cbcf088606c /remoting/protocol/jingle_session_manager.h
parent056dd45d610de34312344445d7b078a31f4a1e20 (diff)
downloadchromium_src-4b559b4ddffc0b7f688019bcb80658f05e063af7.zip
chromium_src-4b559b4ddffc0b7f688019bcb80658f05e063af7.tar.gz
chromium_src-4b559b4ddffc0b7f688019bcb80658f05e063af7.tar.bz2
Move crypto files out of base, to a top level directory.
src/crypto is now an independent project that contains our cryptographic primitives (except md5 and sha1). This removes the base dependency from nss, openssl and sqlite. BUG=76996 TEST=none Review URL: http://codereview.chromium.org/6805019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81611 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/protocol/jingle_session_manager.h')
-rw-r--r--remoting/protocol/jingle_session_manager.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/remoting/protocol/jingle_session_manager.h b/remoting/protocol/jingle_session_manager.h
index 96f3cc9..943edf6 100644
--- a/remoting/protocol/jingle_session_manager.h
+++ b/remoting/protocol/jingle_session_manager.h
@@ -18,7 +18,7 @@
class MessageLoop;
-namespace base {
+namespace crypto {
class RSAPrivateKey;
} // namespace base
@@ -84,7 +84,7 @@ class JingleSessionManager
virtual void Init(const std::string& local_jid,
cricket::SessionManager* cricket_session_manager,
IncomingSessionCallback* incoming_session_callback,
- base::RSAPrivateKey* private_key,
+ crypto::RSAPrivateKey* private_key,
scoped_refptr<net::X509Certificate> certificate);
// SessionManager interface.
@@ -149,7 +149,7 @@ class JingleSessionManager
std::list<scoped_refptr<JingleSession> > sessions_;
scoped_refptr<net::X509Certificate> certificate_;
- scoped_ptr<base::RSAPrivateKey> private_key_;
+ scoped_ptr<crypto::RSAPrivateKey> private_key_;
DISALLOW_COPY_AND_ASSIGN(JingleSessionManager);
};