Refactoring: Move MessagePipeReader subclasess out from ChannelMojo

ipc/mojo/ipc_channel_mojo_readers.h

Index: ipc/mojo/ipc_channel_mojo_readers.h
diff --git a/ipc/mojo/ipc_channel_mojo_readers.h b/ipc/mojo/ipc_channel_mojo_readers.h
new file mode 100644
index 0000000000000000000000000000000000000000..7a3a36adf3e17cc2feec5f51cf26be6307facb4f
--- /dev/null
+++ b/ipc/mojo/ipc_channel_mojo_readers.h
@@ -0,0 +1,101 @@
+// Copyright 2014 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 IPC_MOJO_IPC_CHANNEL_MOJO_READERS_H_
+#define IPC_MOJO_IPC_CHANNEL_MOJO_READERS_H_
+
+#include <vector>
+
+#include "base/memory/scoped_ptr.h"
+#include "base/memory/scoped_vector.h"

[viettrungluu, 2014/09/11 17:10:25]

nit: I don't think you use scoped_vector.h

[Hajime Morrita, 2014/09/11 17:19:10]

Done.

+#include "base/memory/weak_ptr.h"

[viettrungluu, 2014/09/11 17:10:24]

... nor weak_ptr

[Hajime Morrita, 2014/09/11 17:19:10]

Done.

+#include "ipc/ipc_channel.h"
+#include "ipc/ipc_channel_factory.h"
+#include "ipc/ipc_export.h"

[viettrungluu, 2014/09/11 17:10:25]

nit: I don't think this file has any exports

[Hajime Morrita, 2014/09/11 17:19:10]

Done.

+#include "ipc/mojo/ipc_message_pipe_reader.h"
+#include "mojo/public/cpp/system/core.h"
+
+namespace mojo {
+namespace embedder {
+struct ChannelInfo;
+}
+}
+
+namespace IPC {
+
+class ChannelMojo;
+
+namespace internal {
+
+// A MessagePipeReader implemenation for IPC::Message communication.

[viettrungluu, 2014/09/11 17:10:25]

nit: implemenation -> implementation

[Hajime Morrita, 2014/09/11 17:19:10]

Done.

+class MessageReader : public MessagePipeReader {
+ public:
+  MessageReader(mojo::ScopedMessagePipeHandle pipe, ChannelMojo* owner);
+
+  bool Send(scoped_ptr<Message> message);
+
+  // MessagePipeReader implemenation
+  virtual void OnMessageReceived() OVERRIDE;
+  virtual void OnPipeClosed() OVERRIDE;
+  virtual void OnPipeError(MojoResult error) OVERRIDE;
+
+ private:
+  ChannelMojo* owner_;
+
+  DISALLOW_COPY_AND_ASSIGN(MessageReader);
+};
+
+// MessagePipeReader implementation for control messages.
+// Actual message handling is implemented by sublcasses.
+class ControlReader : public MessagePipeReader {
+ public:
+  ControlReader(mojo::ScopedMessagePipeHandle pipe, ChannelMojo* owner);
+
+  virtual bool Connect();
+
+  // MessagePipeReader implemenation
+  virtual void OnPipeClosed() OVERRIDE;
+  virtual void OnPipeError(MojoResult error) OVERRIDE;
+
+ protected:
+  ChannelMojo* owner_;
+
+  DISALLOW_COPY_AND_ASSIGN(ControlReader);
+};
+
+// ControlReader for server-side ChannelMojo.
+class ServerControlReader : public ControlReader {
+ public:
+  ServerControlReader(mojo::ScopedMessagePipeHandle pipe, ChannelMojo* owner);
+  virtual ~ServerControlReader();
+
+  // ControlReader override
+  virtual bool Connect() OVERRIDE;
+
+  // MessagePipeReader implemenation
+  virtual void OnMessageReceived() OVERRIDE;
+
+ private:
+  MojoResult SendHelloRequest();
+  MojoResult RespondHelloResponse();
+
+  mojo::ScopedMessagePipeHandle message_pipe_;
+};

[viettrungluu, 2014/09/11 17:10:25]

nit: probably you should have a DISALLOW_COPY_AND_ASSIGN (and probably also
include base/macros.h for it)

+
+// ControlReader for client-side ChannelMojo.
+class ClientControlReader : public ControlReader {
+ public:
+  ClientControlReader(mojo::ScopedMessagePipeHandle pipe, ChannelMojo* owner);
+
+  // MessagePipeReader implemenation
+  virtual void OnMessageReceived() OVERRIDE;
+
+ private:
+  MojoResult RespondHelloRequest(MojoHandle message_channel);
+};

[viettrungluu, 2014/09/11 17:10:25]

ditto

+
+}  // namespace internal
+}  // namespace IPC
+
+#endif  // IPC_MOJO_IPC_CHANNEL_MOJO_READERS_H_