Implement WebDataConsumerHandle::Reader.

content/child/web_data_consumer_handle_impl.h

Index: content/child/web_data_consumer_handle_impl.h
diff --git a/content/child/web_data_consumer_handle_impl.h b/content/child/web_data_consumer_handle_impl.h
index 530387586f421693388d315077a9a783d6f061a1..0efda38b1c6db9051930aab8f7b8d97b1f0891af 100644
--- a/content/child/web_data_consumer_handle_impl.h
+++ b/content/child/web_data_consumer_handle_impl.h
@@ -16,23 +16,38 @@ namespace content {
 class CONTENT_EXPORT WebDataConsumerHandleImpl final
     : public NON_EXPORTED_BASE(blink::WebDataConsumerHandle) {
   typedef mojo::ScopedDataPipeConsumerHandle Handle;
+  class Context;
+
  public:
+  class ReaderImpl final : public Reader {
+   public:
+    ReaderImpl(scoped_refptr<Context> context, Client* client);
+    virtual ~ReaderImpl();
+    virtual Result read(void* data, size_t size, Flags flags, size_t* readSize);
+    virtual Result beginRead(const void** buffer,
+                             Flags flags,
+                             size_t* available);
+    virtual Result endRead(size_t readSize);
+
+   private:
+    Result HandleReadResult(MojoResult);
+    void StartWatching();
+    void OnHandleGotReadable(MojoResult);
+
+    scoped_refptr<Context> context_;
+    mojo::common::HandleWatcher handle_watcher_;
+    Client* client_;
+  };
+  scoped_ptr<ReaderImpl> obtainReaderImpl(Client* client);
+
   explicit WebDataConsumerHandleImpl(Handle handle);
   virtual ~WebDataConsumerHandleImpl();
 
-  virtual Result read(void* data, size_t size, Flags flags, size_t* readSize);
-  virtual Result beginRead(const void** buffer, Flags flags, size_t* available);
-  virtual Result endRead(size_t readSize);
-  virtual void registerClient(Client* client);
-  virtual void unregisterClient();
-
  private:
-  Result HandleReadResult(MojoResult);
-  void OnHandleGotReadable(MojoResult);
+  virtual ReaderImpl* obtainReaderInternal(Client* client);
 
+  scoped_refptr<Context> context_;
   Handle handle_;

[hiroshige, 2015/06/12 10:12:09]

Can we remove |handle_| (not used, actual |handle_| is in Context)?

[yhirano, 2015/06/15 10:23:22]

Done.

-  Client* client_;
-  mojo::common::HandleWatcher handle_watcher_;
 };
 
 }  // namespace content