Add Resource Handler for creating Streams to forward to extensions

content/browser/streams/stream.cc

Index: content/browser/streams/stream.cc
diff --git a/content/browser/streams/stream.cc b/content/browser/streams/stream.cc
index 590452b519fd59792c5209ea6cdaec0cb1d0630d..9601758c86214b033bda6c0a17d679c3a3e3de17 100644
--- a/content/browser/streams/stream.cc
+++ b/content/browser/streams/stream.cc
@@ -6,6 +6,7 @@
 
 #include "base/bind.h"
 #include "base/message_loop_proxy.h"
+#include "content/browser/streams/stream_handle_impl.h"
 #include "content/browser/streams/stream_read_observer.h"
 #include "content/browser/streams/stream_registry.h"
 #include "content/browser/streams/stream_write_observer.h"
@@ -30,6 +31,7 @@ Stream::Stream(StreamRegistry* registry,
       registry_(registry),
       read_observer_(NULL),
       write_observer_(write_observer),
+      stream_handle_(NULL),
       weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
   CreateByteStream(base::MessageLoopProxy::current(),
                    base::MessageLoopProxy::current(),
@@ -61,6 +63,11 @@ void Stream::RemoveReadObserver(StreamReadObserver* observer) {
   read_observer_ = NULL;
 }
 
+void Stream::RemoveWriteObserver(StreamWriteObserver* observer) {
+  DCHECK(observer == write_observer_);
+  write_observer_ = NULL;
+}
+
 void Stream::AddData(scoped_refptr<net::IOBuffer> buffer, size_t size) {
   can_add_data_ = writer_->Write(buffer, size);
 }
@@ -83,6 +90,8 @@ Stream::StreamState Stream::ReadRawData(net::IOBuffer* buf,
       case ByteStreamReader::STREAM_HAS_DATA:
         break;
       case ByteStreamReader::STREAM_COMPLETE:
+        if (stream_handle_)
+          stream_handle_->SendCloseEvent();
         registry_->UnregisterStream(url());

[darin (slow to review), 2013/03/19 06:12:51]

is there any possibility that SendCloseEvent could end up deleting |this|? 
should you consider calling UnregisterStream first to play it safe?

[Zachary Kuznia, 2013/03/19 06:59:35]

Done.

         return STREAM_COMPLETE;
       case ByteStreamReader::STREAM_EMPTY:
@@ -103,9 +112,24 @@ Stream::StreamState Stream::ReadRawData(net::IOBuffer* buf,
   return STREAM_HAS_DATA;
 }
 
+scoped_ptr<StreamHandle> Stream::CreateHandle() {
+  CHECK(!stream_handle_);
+  stream_handle_ = new StreamHandleImpl(weak_ptr_factory_.GetWeakPtr());
+  return scoped_ptr<StreamHandle>(stream_handle_).Pass();
+}
+
+void Stream::CloseHandle() {
+  CHECK(stream_handle_);
+  stream_handle_ = NULL;
+  if (write_observer_)
+    write_observer_->OnClose(this);

[darin (slow to review), 2013/03/19 06:12:51]

ditto:  calling out to the write observer is calling out to foreign code.  how
do you know that |this| will still be valid memory upon return from OnClose?  do
we need to worry about dereferencing registry_?

[Zachary Kuznia, 2013/03/19 06:59:35]

Done.

+  registry_->UnregisterStream(url());
+}
+
 void Stream::OnSpaceAvailable() {
   can_add_data_ = true;
-  write_observer_->OnSpaceAvailable(this);
+  if (write_observer_)
+    write_observer_->OnSpaceAvailable(this);
 }
 
 void Stream::OnDataAvailable() {