Move HostKeyPair into protocol::KeyPair.

remoting/host/setup/host_starter.cc

 // Copyright (c) 2012 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.
 
 #include "remoting/host/setup/host_starter.h"
 
 #include "base/guid.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/values.h"
 #include "google_apis/google_api_keys.h"
@@ skipping 88 matching lines @@
 
 void HostStarter::OnGetUserInfoResponse(const std::string& user_email) {
   if (!main_task_runner_->BelongsToCurrentThread()) {
     main_task_runner_->PostTask(FROM_HERE, base::Bind(
         &HostStarter::OnGetUserInfoResponse, weak_ptr_, user_email));
     return;
   }
   user_email_ = user_email;
   // Register the host.
   host_id_ = base::GenerateGUID();
-  key_pair_.Generate();
+  key_pair_ = new RsaKeyPair();
+  key_pair_->Generate();
   service_client_->RegisterHost(
-      host_id_, host_name_, key_pair_.GetPublicKey(), access_token_, this);
+      host_id_, host_name_, key_pair_->GetPublicKey(), access_token_, this);
 }
 
 void HostStarter::OnHostRegistered() {
   if (!main_task_runner_->BelongsToCurrentThread()) {
     main_task_runner_->PostTask(FROM_HERE, base::Bind(
         &HostStarter::OnHostRegistered, weak_ptr_));
     return;
   }
   // Start the host.
   std::string host_secret_hash = remoting::MakeHostPinHash(host_id_, host_pin_);
   scoped_ptr<base::DictionaryValue> config(new base::DictionaryValue());
   config->SetString("xmpp_login", user_email_);
   config->SetString("oauth_refresh_token", refresh_token_);
   config->SetString("host_id", host_id_);
   config->SetString("host_name", host_name_);
-  config->SetString("private_key", key_pair_.GetAsString());
+  config->SetString("private_key", key_pair_->GetAsString());
   config->SetString("host_secret_hash", host_secret_hash);
   daemon_controller_->SetConfigAndStart(
       config.Pass(), consent_to_data_collection_,
       base::Bind(&HostStarter::OnHostStarted, base::Unretained(this)));
 }
 
 void HostStarter::OnHostStarted(DaemonController::AsyncResult result) {
   if (!main_task_runner_->BelongsToCurrentThread()) {
     main_task_runner_->PostTask(FROM_HERE, base::Bind(
         &HostStarter::OnHostStarted, weak_ptr_, result));
@@ skipping 37 matching lines @@
     main_task_runner_->PostTask(FROM_HERE, base::Bind(
         &HostStarter::OnHostUnregistered, weak_ptr_));
     return;
   }
   CompletionCallback cb = on_done_;
   on_done_.Reset();
   cb.Run(START_ERROR);
 }
 
 }  // namespace remoting