Move HostKeyPair into protocol::KeyPair.

remoting/host/register_support_host_request.h

 // 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.
 
 #ifndef REMOTING_HOST_REGISTER_SUPPORT_HOST_REQUEST_H_
 #define REMOTING_HOST_REGISTER_SUPPORT_HOST_REQUEST_H_
 
 #include <string>
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "remoting/jingle_glue/signal_strategy.h"
-#include "remoting/host/host_key_pair.h"
+#include "remoting/protocol/key_pair.h"
 #include "testing/gtest/include/gtest/gtest_prod.h"
 
 class MessageLoop;
 
 namespace buzz {
 class XmlElement;
 }  // namespace buzz
 
 namespace base {
 class TimeDelta;
@@ skipping 17 matching lines @@
                               const base::TimeDelta&)> RegisterCallback;
 
   // |signal_strategy| and |key_pair| must outlive this
   // object. |callback| is called when registration response is
   // received from the server. Callback is never called if the bot
   // malfunctions and doesn't respond to the request.
   //
   // TODO(sergeyu): This class should have timeout for the bot
   // response.
   RegisterSupportHostRequest(SignalStrategy* signal_strategy,
-                             HostKeyPair* key_pair,
+                             protocol::KeyPair* key_pair,

[Wez, 2013/02/23 03:43:20]

Now that we can copy, use scoped_ptr<> here?

[rmsousa, 2013/02/26 02:38:52]

Done.

                              const std::string& directory_bot_jid,
                              const RegisterCallback& callback);
   virtual ~RegisterSupportHostRequest();
 
   // HostStatusObserver implementation.
   virtual void OnSignalStrategyStateChange(
       SignalStrategy::State state) OVERRIDE;
   virtual bool OnSignalStrategyIncomingStanza(
       const buzz::XmlElement* stanza) OVERRIDE;
 
  private:
   void DoSend();
 
   scoped_ptr<buzz::XmlElement> CreateRegistrationRequest(
       const std::string& jid);
   scoped_ptr<buzz::XmlElement> CreateSignature(const std::string& jid);
 
   void ProcessResponse(IqRequest* request, const buzz::XmlElement* response);
   bool ParseResponse(const buzz::XmlElement* response,
                      std::string* support_id, base::TimeDelta* lifetime);
 
   void CallCallback(
       bool success, const std::string& support_id, base::TimeDelta lifetime);
 
   SignalStrategy* signal_strategy_;
-  HostKeyPair* key_pair_;
+  protocol::KeyPair* key_pair_;
   std::string directory_bot_jid_;
   RegisterCallback callback_;
 
   scoped_ptr<IqSender> iq_sender_;
   scoped_ptr<IqRequest> request_;
 
   DISALLOW_COPY_AND_ASSIGN(RegisterSupportHostRequest);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_REGISTER_SUPPORT_HOST_REQUEST_H_