summaryrefslogtreecommitdiffstats
path: root/remoting/protocol
diff options
context:
space:
mode:
Diffstat (limited to 'remoting/protocol')
-rw-r--r--remoting/protocol/jingle_session.cc8
-rw-r--r--remoting/protocol/jingle_session.h8
-rw-r--r--remoting/protocol/jingle_session_manager.cc2
-rw-r--r--remoting/protocol/jingle_session_manager.h6
-rw-r--r--remoting/protocol/jingle_session_unittest.cc6
-rw-r--r--remoting/protocol/protocol_test_client.cc8
6 files changed, 19 insertions, 19 deletions
diff --git a/remoting/protocol/jingle_session.cc b/remoting/protocol/jingle_session.cc
index 701ee9d..78cfbae 100644
--- a/remoting/protocol/jingle_session.cc
+++ b/remoting/protocol/jingle_session.cc
@@ -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::CreateClientSession(
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 @@ JingleSession::JingleSession(
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());
}
}
diff --git a/remoting/protocol/jingle_session.h b/remoting/protocol/jingle_session.h
index 74b0efe..caaa82f 100644
--- a/remoting/protocol/jingle_session.h
+++ b/remoting/protocol/jingle_session.h
@@ -5,8 +5,8 @@
#ifndef REMOTING_PROTOCOL_JINGLE_SESSION_H_
#define REMOTING_PROTOCOL_JINGLE_SESSION_H_
-#include "base/crypto/rsa_private_key.h"
#include "base/memory/ref_counted.h"
+#include "crypto/rsa_private_key.h"
#include "net/base/completion_callback.h"
#include "remoting/protocol/session.h"
#include "third_party/libjingle/source/talk/base/sigslot.h"
@@ -53,7 +53,7 @@ class JingleSession : public protocol::Session,
static JingleSession* CreateServerSession(
JingleSessionManager* manager,
scoped_refptr<net::X509Certificate> certificate,
- base::RSAPrivateKey* key);
+ crypto::RSAPrivateKey* key);
// Chromotocol Session interface.
virtual void SetStateChangeCallback(StateChangeCallback* callback);
@@ -86,7 +86,7 @@ class JingleSession : public protocol::Session,
JingleSession(JingleSessionManager* client,
scoped_refptr<net::X509Certificate> server_cert,
- base::RSAPrivateKey* key);
+ crypto::RSAPrivateKey* key);
virtual ~JingleSession();
// Called by JingleSessionManager.
@@ -129,7 +129,7 @@ class JingleSession : public protocol::Session,
scoped_refptr<net::X509Certificate> server_cert_;
// Private key used in SSL server sockets.
- scoped_ptr<base::RSAPrivateKey> key_;
+ scoped_ptr<crypto::RSAPrivateKey> key_;
State state_;
scoped_ptr<StateChangeCallback> state_change_callback_;
diff --git a/remoting/protocol/jingle_session_manager.cc b/remoting/protocol/jingle_session_manager.cc
index 22ec733..29eacd7 100644
--- a/remoting/protocol/jingle_session_manager.cc
+++ b/remoting/protocol/jingle_session_manager.cc
@@ -178,7 +178,7 @@ void JingleSessionManager::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) {
if (MessageLoop::current() != message_loop()) {
message_loop()->PostTask(
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);
};
diff --git a/remoting/protocol/jingle_session_unittest.cc b/remoting/protocol/jingle_session_unittest.cc
index 692b2f0..e11721a 100644
--- a/remoting/protocol/jingle_session_unittest.cc
+++ b/remoting/protocol/jingle_session_unittest.cc
@@ -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 @@ class JingleSessionTest : public testing::Test {
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();
diff --git a/remoting/protocol/protocol_test_client.cc b/remoting/protocol/protocol_test_client.cc
index 6a5881e..c481ca5 100644
--- a/remoting/protocol/protocol_test_client.cc
+++ b/remoting/protocol/protocol_test_client.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -15,9 +15,9 @@ extern "C" {
#include "base/at_exit.h"
#include "base/command_line.h"
-#include "base/nss_util.h"
#include "base/test/mock_chrome_application_mac.h"
#include "base/time.h"
+#include "crypto/nss_util.h"
#include "net/base/completion_callback.h"
#include "net/base/io_buffer.h"
#include "net/base/net_errors.h"
@@ -357,8 +357,8 @@ int main(int argc, char** argv) {
base::AtExitManager exit_manager;
- base::EnsureNSPRInit();
- base::EnsureNSSInit();
+ crypto::EnsureNSPRInit();
+ crypto::EnsureNSSInit();
#if defined(OS_MACOSX)
mock_cr_app::RegisterMockCrApp();
generated by cgit v1.1 at 2025-02-07 16:15:00 +0000