| Index: remoting/host/security_key/fake_security_key_message_writer.h
|
| diff --git a/remoting/host/security_key/fake_remote_security_key_message_writer.h b/remoting/host/security_key/fake_security_key_message_writer.h
|
| similarity index 46%
|
| rename from remoting/host/security_key/fake_remote_security_key_message_writer.h
|
| rename to remoting/host/security_key/fake_security_key_message_writer.h
|
| index 4ae6759e1757397302c1aae61dde88eaa7e942a8..c131751da38f95509f3820a77832929c292091f5 100644
|
| --- a/remoting/host/security_key/fake_remote_security_key_message_writer.h
|
| +++ b/remoting/host/security_key/fake_security_key_message_writer.h
|
| @@ -2,38 +2,34 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef REMOTING_HOST_SECURITY_KEY_FAKE_REMOTE_SECURITY_KEY_MESSAGE_WRITER_H_
|
| -#define REMOTING_HOST_SECURITY_KEY_FAKE_REMOTE_SECURITY_KEY_MESSAGE_WRITER_H_
|
| +#ifndef REMOTING_HOST_SECURITY_KEY_FAKE_SECURITY_KEY_MESSAGE_WRITER_H_
|
| +#define REMOTING_HOST_SECURITY_KEY_FAKE_SECURITY_KEY_MESSAGE_WRITER_H_
|
|
|
| #include <string>
|
|
|
| #include "base/callback.h"
|
| #include "base/macros.h"
|
| #include "base/memory/weak_ptr.h"
|
| -#include "remoting/host/security_key/remote_security_key_message_writer.h"
|
| #include "remoting/host/security_key/security_key_message.h"
|
| +#include "remoting/host/security_key/security_key_message_writer.h"
|
|
|
| namespace remoting {
|
|
|
| -// Simulates the RemoteSecurityKeyMessageWriter and provides access to data
|
| +// Simulates the SecurityKeyMessageWriter and provides access to data
|
| // members for testing.
|
| -class FakeRemoteSecurityKeyMessageWriter
|
| - : public RemoteSecurityKeyMessageWriter {
|
| +class FakeSecurityKeyMessageWriter : public SecurityKeyMessageWriter {
|
| public:
|
| - explicit FakeRemoteSecurityKeyMessageWriter(
|
| - const base::Closure& write_callback);
|
| - ~FakeRemoteSecurityKeyMessageWriter() override;
|
| + explicit FakeSecurityKeyMessageWriter(const base::Closure& write_callback);
|
| + ~FakeSecurityKeyMessageWriter() override;
|
|
|
| - // RemoteSecurityKeyMessageWriter interface.
|
| - bool WriteMessage(RemoteSecurityKeyMessageType message_type) override;
|
| - bool WriteMessageWithPayload(RemoteSecurityKeyMessageType message_type,
|
| + // SecurityKeyMessageWriter interface.
|
| + bool WriteMessage(SecurityKeyMessageType message_type) override;
|
| + bool WriteMessageWithPayload(SecurityKeyMessageType message_type,
|
| const std::string& message_payload) override;
|
|
|
| - base::WeakPtr<FakeRemoteSecurityKeyMessageWriter> AsWeakPtr();
|
| + base::WeakPtr<FakeSecurityKeyMessageWriter> AsWeakPtr();
|
|
|
| - RemoteSecurityKeyMessageType last_message_type() {
|
| - return last_message_type_;
|
| - }
|
| + SecurityKeyMessageType last_message_type() { return last_message_type_; }
|
|
|
| const std::string& last_message_payload() { return last_message_payload_; }
|
|
|
| @@ -43,8 +39,7 @@ class FakeRemoteSecurityKeyMessageWriter
|
|
|
| private:
|
| // Tracks the last message_type value written.
|
| - RemoteSecurityKeyMessageType last_message_type_ =
|
| - RemoteSecurityKeyMessageType::INVALID;
|
| + SecurityKeyMessageType last_message_type_ = SecurityKeyMessageType::INVALID;
|
|
|
| // Tracks the last message_payload value written.
|
| std::string last_message_payload_;
|
| @@ -55,11 +50,11 @@ class FakeRemoteSecurityKeyMessageWriter
|
| // Signaled whenever a write is requested.
|
| base::Closure write_callback_;
|
|
|
| - base::WeakPtrFactory<FakeRemoteSecurityKeyMessageWriter> weak_factory_;
|
| + base::WeakPtrFactory<FakeSecurityKeyMessageWriter> weak_factory_;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(FakeRemoteSecurityKeyMessageWriter);
|
| + DISALLOW_COPY_AND_ASSIGN(FakeSecurityKeyMessageWriter);
|
| };
|
|
|
| } // namespace remoting
|
|
|
| -#endif // REMOTING_HOST_SECURITY_KEY_FAKE_REMOTE_SECURITY_KEY_MESSAGE_WRITER_H_
|
| +#endif // REMOTING_HOST_SECURITY_KEY_FAKE_SECURITY_KEY_MESSAGE_WRITER_H_
|
|
|