Index: remoting/host/plugin/host_script_object.cc |
diff --git a/remoting/host/plugin/host_script_object.cc b/remoting/host/plugin/host_script_object.cc |
index 02ade7b7f2a1569ad1d31785e56c3df4944c4ba5..f16b5809757963cc1fed5f7cc86363ae74247fc1 100644 |
--- a/remoting/host/plugin/host_script_object.cc |
+++ b/remoting/host/plugin/host_script_object.cc |
@@ -23,7 +23,6 @@ |
#include "remoting/host/chromoting_host_context.h" |
#include "remoting/host/host_config.h" |
#include "remoting/host/host_event_logger.h" |
-#include "remoting/host/host_key_pair.h" |
#include "remoting/host/host_secret.h" |
#include "remoting/host/host_status_observer.h" |
#include "remoting/host/it2me_host_user_interface.h" |
@@ -36,6 +35,7 @@ |
#include "remoting/host/session_manager_factory.h" |
#include "remoting/jingle_glue/xmpp_signal_strategy.h" |
#include "remoting/protocol/it2me_host_authenticator_factory.h" |
+#include "remoting/protocol/key_pair.h" |
#include "third_party/npapi/bindings/npruntime.h" |
namespace remoting { |
@@ -162,7 +162,7 @@ class HostNPScriptObject::It2MeImpl |
State state_; |
- HostKeyPair host_key_pair_; |
+ protocol::KeyPair host_key_pair_; |
scoped_ptr<SignalStrategy> signal_strategy_; |
scoped_ptr<RegisterSupportHostRequest> register_request_; |
scoped_ptr<LogToServer> log_to_server_; |
@@ -651,7 +651,7 @@ void HostNPScriptObject::It2MeImpl::OnReceivedSupportID( |
scoped_ptr<protocol::AuthenticatorFactory> factory( |
new protocol::It2MeHostAuthenticatorFactory( |
- local_certificate, *host_key_pair_.private_key(), access_code)); |
+ local_certificate, host_key_pair_.Copy(), access_code)); |
host_->SetAuthenticatorFactory(factory.Pass()); |
// Pass the Access Code to the script object before changing state. |
@@ -1447,7 +1447,7 @@ bool HostNPScriptObject::LocalizeStringWithSubstitution( |
} |
void HostNPScriptObject::DoGenerateKeyPair(const ScopedRefNPObject& callback) { |
Wez
2013/02/23 03:43:20
Not strictly related to this CL, but... DoGenerate
rmsousa
2013/02/26 02:38:52
There's already a TODO comment for it. I'll do tha
|
- HostKeyPair key_pair; |
+ protocol::KeyPair key_pair; |
key_pair.Generate(); |
InvokeGenerateKeyPairCallback(callback, key_pair.GetAsString(), |
key_pair.GetPublicKey()); |