Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(603)

Unified Diff: remoting/protocol/jingle_session.cc

Issue 6805019: Move crypto files out of base, to a top level directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Fixes comments by eroman Created 9 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/protocol/jingle_session.h ('k') | remoting/protocol/jingle_session_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/jingle_session.cc
===================================================================
--- remoting/protocol/jingle_session.cc (revision 81350)
+++ remoting/protocol/jingle_session.cc (working copy)
@@ -4,8 +4,8 @@
#include "remoting/protocol/jingle_session.h"
-#include "base/crypto/rsa_private_key.h"
#include "base/message_loop.h"
+#include "crypto/rsa_private_key.h"
#include "jingle/glue/channel_socket_adapter.h"
#include "jingle/glue/stream_socket_adapter.h"
#include "net/base/cert_status_flags.h"
@@ -83,13 +83,13 @@
JingleSession* JingleSession::CreateServerSession(
JingleSessionManager* manager,
scoped_refptr<net::X509Certificate> certificate,
- base::RSAPrivateKey* key) {
+ crypto::RSAPrivateKey* key) {
return new JingleSession(manager, certificate, key);
}
JingleSession::JingleSession(
JingleSessionManager* jingle_session_manager,
- scoped_refptr<net::X509Certificate> server_cert, base::RSAPrivateKey* key)
+ scoped_refptr<net::X509Certificate> server_cert, crypto::RSAPrivateKey* key)
: jingle_session_manager_(jingle_session_manager),
server_cert_(server_cert),
state_(INITIALIZING),
@@ -105,7 +105,7 @@
if (key) {
std::vector<uint8> key_bytes;
CHECK(key->ExportPrivateKey(&key_bytes));
- key_.reset(base::RSAPrivateKey::CreateFromPrivateKeyInfo(key_bytes));
+ key_.reset(crypto::RSAPrivateKey::CreateFromPrivateKeyInfo(key_bytes));
CHECK(key_.get());
}
}
« no previous file with comments | « remoting/protocol/jingle_session.h ('k') | remoting/protocol/jingle_session_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698