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

Unified Diff: remoting/protocol/jingle_session_unittest.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_manager.cc ('k') | remoting/protocol/protocol_test_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/jingle_session_unittest.cc
===================================================================
--- remoting/protocol/jingle_session_unittest.cc (revision 81350)
+++ remoting/protocol/jingle_session_unittest.cc (working copy)
@@ -4,11 +4,11 @@
#include "base/file_path.h"
#include "base/file_util.h"
-#include "base/nss_util.h"
#include "base/path_service.h"
#include "base/time.h"
#include "base/synchronization/waitable_event.h"
#include "base/test/test_timeouts.h"
+#include "crypto/nss_util.h"
#include "net/base/completion_callback.h"
#include "net/base/io_buffer.h"
#include "net/base/net_errors.h"
@@ -138,8 +138,8 @@
reinterpret_cast<const uint8*>(key_string.data()),
reinterpret_cast<const uint8*>(key_string.data() +
key_string.length()));
- scoped_ptr<base::RSAPrivateKey> private_key(
- base::RSAPrivateKey::CreateFromPrivateKeyInfo(key_vector));
+ scoped_ptr<crypto::RSAPrivateKey> private_key(
+ crypto::RSAPrivateKey::CreateFromPrivateKeyInfo(key_vector));
session_manager_pair_ = new SessionManagerPair(&thread_);
session_manager_pair_->Init();
« no previous file with comments | « remoting/protocol/jingle_session_manager.cc ('k') | remoting/protocol/protocol_test_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698