Add handle waiting to StashBackend.

extensions/browser/mojo/stash_backend_unittest.cc

 // 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.
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "extensions/browser/mojo/stash_backend.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace extensions {
+namespace {
+
+// Create a data pipe, write some data to the proucer handle and return the

[Anand Mistry (off Chromium), 2015/02/05 11:10:33]

proucer

[Sam McNally, 2015/02/05 23:35:31]

Done.

+// consumer handle.
+mojo::ScopedHandle CreateReadableHandle() {
+  mojo::ScopedDataPipeConsumerHandle consumer_handle;
+  mojo::ScopedDataPipeProducerHandle producer_handle;
+  MojoCreateDataPipeOptions options = {
+      sizeof(options), MOJO_CREATE_DATA_PIPE_OPTIONS_FLAG_NONE, 1, 1,
+  };
+  MojoResult result =
+      mojo::CreateDataPipe(&options, &producer_handle, &consumer_handle);
+  EXPECT_EQ(MOJO_RESULT_OK, result);
+  uint32_t num_bytes = 1;
+  result = mojo::WriteDataRaw(producer_handle.get(), "a", &num_bytes,
+                              MOJO_WRITE_DATA_FLAG_NONE);
+  EXPECT_EQ(MOJO_RESULT_OK, result);
+  EXPECT_EQ(1u, num_bytes);
+  return mojo::ScopedHandle::From(consumer_handle.Pass());
+}
+
+}  // namespace
 
 class StashServiceTest : public testing::Test, public mojo::ErrorHandler {
  public:
   enum Event {
     EVENT_NONE,
     EVENT_STASH_RETRIEVED,
+    EVENT_HANDLE_READY,
   };
 
   StashServiceTest() {}
 
   void SetUp() override {
     expecting_error_ = false;
     expected_event_ = EVENT_NONE;
-    stash_backend_.reset(new StashBackend);
+    stash_backend_.reset(new StashBackend(base::Bind(
+        &StashServiceTest::OnHandleReadyToRead, base::Unretained(this))));
     stash_backend_->BindToRequest(mojo::GetProxy(&stash_service_));
     stash_service_.set_error_handler(this);
+    handles_ready_ = 0;
   }
 
   void OnConnectionError() override { FAIL() << "Unexpected connection error"; }
 
   mojo::Array<StashedObjectPtr> RetrieveStash() {
     mojo::Array<StashedObjectPtr> stash;
     stash_service_->RetrieveStash(base::Bind(
         &StashServiceTest::StashRetrieved, base::Unretained(this), &stash));
     WaitForEvent(EVENT_STASH_RETRIEVED);
     return stash.Pass();
@@ skipping 10 matching lines @@
     base::RunLoop run_loop;
     stop_run_loop_ = run_loop.QuitClosure();
     run_loop.Run();
   }
 
   void EventReceived(Event event) {
     if (event == expected_event_ && !stop_run_loop_.is_null())
       stop_run_loop_.Run();
   }
 
+  void OnHandleReadyToRead() {
+    handles_ready_++;
+    EventReceived(EVENT_HANDLE_READY);
+  }
+
  protected:
   base::MessageLoop message_loop_;
   base::Closure stop_run_loop_;
   scoped_ptr<StashBackend> stash_backend_;
   Event expected_event_;
   bool expecting_error_;
   mojo::InterfacePtr<StashService> stash_service_;
+  int handles_ready_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(StashServiceTest);
 };
 
 // Test that adding stashed objects in multiple calls can all be retrieved by a
 // Retrieve call.
 TEST_F(StashServiceTest, AddTwiceAndRetrieve) {
   mojo::Array<StashedObjectPtr> stashed_objects;
   StashedObjectPtr stashed_object(StashedObject::New());
@@ skipping 65 matching lines @@
   ASSERT_EQ(1u, num_bytes);
   EXPECT_EQ('1', data);
 }
 
 TEST_F(StashServiceTest, RetrieveWithoutStashing) {
   mojo::Array<StashedObjectPtr> stashed_objects = RetrieveStash();
   ASSERT_TRUE(!stashed_objects.is_null());
   EXPECT_EQ(0u, stashed_objects.size());
 }
 
+TEST_F(StashServiceTest, NotifyOnReadableHandle) {
+  mojo::Array<StashedObjectPtr> stash_entries;
+  StashedObjectPtr stashed_object(StashedObject::New());
+  stashed_object->id = "test type";
+  stashed_object->data.push_back(0);
+  stashed_object->monitor_handles = true;
+  mojo::InterfacePtr<StashService> stash_service;

[Anand Mistry (off Chromium), 2015/02/05 11:10:33]

stash_service and stash_service_ is confusing. I has to re-read this test a few
times before I understood what was going on.

[Sam McNally, 2015/02/05 23:35:31]

Done.

+
+  stashed_object->stashed_handles.push_back(mojo::ScopedHandle::From(
+      mojo::GetProxy(&stash_service).PassMessagePipe()));
+
+  stash_entries.push_back(stashed_object.Pass());
+  stash_service_->AddToStash(stash_entries.Pass());
+  stash_entries.resize(0);
+  stash_service->AddToStash(stash_entries.Pass());
+  WaitForEvent(EVENT_HANDLE_READY);
+  EXPECT_EQ(1, handles_ready_);
+}
+
+TEST_F(StashServiceTest, NotifyOnReadableDataPipeHandle) {
+  mojo::Array<StashedObjectPtr> stash_entries;
+  StashedObjectPtr stashed_object(StashedObject::New());
+  stashed_object->id = "test type";
+  stashed_object->monitor_handles = true;
+
+  MojoCreateDataPipeOptions options = {
+      sizeof(options), MOJO_CREATE_DATA_PIPE_OPTIONS_FLAG_NONE, 1, 1,
+  };
+  mojo::ScopedDataPipeConsumerHandle consumer_handle;
+  mojo::ScopedDataPipeProducerHandle producer_handle;
+  uint32_t num_bytes = 1;
+  MojoResult result =
+      mojo::CreateDataPipe(&options, &producer_handle, &consumer_handle);
+  ASSERT_EQ(MOJO_RESULT_OK, result);
+  result = mojo::WriteDataRaw(producer_handle.get(), "a", &num_bytes,
+                              MOJO_WRITE_DATA_FLAG_NONE);
+  ASSERT_EQ(MOJO_RESULT_OK, result);
+  ASSERT_EQ(1u, num_bytes);
+  stashed_object->stashed_handles.push_back(
+      mojo::ScopedHandle::From(producer_handle.Pass()));
+  stashed_object->stashed_handles.push_back(
+      mojo::ScopedHandle::From(consumer_handle.Pass()));
+  stashed_object->data.push_back(1);
+
+  stash_entries.push_back(stashed_object.Pass());
+  stash_service_->AddToStash(stash_entries.Pass());
+  WaitForEvent(EVENT_HANDLE_READY);
+  EXPECT_EQ(1, handles_ready_);
+}
+
+TEST_F(StashServiceTest, NotifyOncePerStashOnReadableHandles) {
+  mojo::Array<StashedObjectPtr> stash_entries;
+  StashedObjectPtr stashed_object(StashedObject::New());
+  stashed_object->id = "test type";
+  stashed_object->data.push_back(1);
+  stashed_object->monitor_handles = true;
+  stashed_object->stashed_handles.push_back(CreateReadableHandle());
+  stashed_object->stashed_handles.push_back(CreateReadableHandle());
+  stash_entries.push_back(stashed_object.Pass());
+  stashed_object = StashedObject::New();
+  stashed_object->id = "another test type";
+  stashed_object->data.push_back(2);
+  stashed_object->monitor_handles = true;
+  stashed_object->stashed_handles.push_back(CreateReadableHandle());
+  stashed_object->stashed_handles.push_back(CreateReadableHandle());
+  stash_entries.push_back(stashed_object.Pass());
+  stash_service_->AddToStash(stash_entries.Pass());
+  WaitForEvent(EVENT_HANDLE_READY);
+  EXPECT_EQ(1, handles_ready_);
+
+  stashed_object = StashedObject::New();
+  stashed_object->id = "yet another test type";
+  stashed_object->data.push_back(3);
+  stashed_object->monitor_handles = true;
+  stashed_object->stashed_handles.push_back(CreateReadableHandle());
+  stashed_object->stashed_handles.push_back(CreateReadableHandle());
+  stash_entries.push_back(stashed_object.Pass());
+  stash_service_->AddToStash(stash_entries.Pass());
+
+  stash_service_->AddToStash(RetrieveStash());
+  WaitForEvent(EVENT_HANDLE_READY);
+  EXPECT_EQ(2, handles_ready_);
+}
+
 // Test that a stash service discards stashed objects when the backend no longer
 // exists.
 TEST_F(StashServiceTest, ServiceWithDeletedBackend) {
   stash_backend_.reset();
   stash_service_.set_error_handler(this);
 
   mojo::Array<StashedObjectPtr> stashed_objects;
   StashedObjectPtr stashed_object(StashedObject::New());
   stashed_object->id = "test type";
   stashed_object->data.push_back(1);
   mojo::MessagePipe message_pipe;
   stashed_object->stashed_handles.push_back(
       mojo::ScopedHandle::From(message_pipe.handle0.Pass()));
   stashed_objects.push_back(stashed_object.Pass());
   stash_service_->AddToStash(stashed_objects.Pass());
   stashed_objects = RetrieveStash();
   ASSERT_EQ(0u, stashed_objects.size());
   // Check that the stashed handle has been closed.
   MojoResult result =
       mojo::Wait(message_pipe.handle1.get(),
                  MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_READABLE,
                  MOJO_DEADLINE_INDEFINITE, nullptr);
   EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION, result);
 }
 
 }  // namespace extensions