Revert of Remove Client= from device/serial/data_stream.mojom.

extensions/renderer/api/serial/data_receiver_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 <queue>
 
 #include "device/serial/data_source_sender.h"
 #include "device/serial/data_stream.mojom.h"
 #include "extensions/renderer/api_test_base.h"
-#include "gin/dictionary.h"
-#include "gin/wrappable.h"
 #include "grit/extensions_renderer_resources.h"
 
 namespace extensions {
 
-class DataReceiverFactory : public gin::Wrappable<DataReceiverFactory> {
- public:
-  using Callback = base::Callback<void(
-      mojo::InterfaceRequest<device::serial::DataSource>,
-      mojo::InterfacePtr<device::serial::DataSourceClient>)>;
-  static gin::Handle<DataReceiverFactory> Create(v8::Isolate* isolate,
-                                                 const Callback& callback) {
-    return gin::CreateHandle(isolate,
-                             new DataReceiverFactory(callback, isolate));
-  }
-
-  gin::ObjectTemplateBuilder GetObjectTemplateBuilder(
-      v8::Isolate* isolate) override {
-    return Wrappable<DataReceiverFactory>::GetObjectTemplateBuilder(isolate)
-        .SetMethod("create", &DataReceiverFactory::CreateReceiver);
-  }
-
-  gin::Dictionary CreateReceiver() {
-    mojo::InterfacePtr<device::serial::DataSource> sink;
-    mojo::InterfacePtr<device::serial::DataSourceClient> client;
-    mojo::InterfaceRequest<device::serial::DataSourceClient> client_request =
-        mojo::GetProxy(&client);
-    callback_.Run(mojo::GetProxy(&sink), client.Pass());
-
-    gin::Dictionary result = gin::Dictionary::CreateEmpty(isolate_);
-    result.Set("source", sink.PassMessagePipe().release());
-    result.Set("client", client_request.PassMessagePipe().release());
-    return result;
-  }
-
-  static gin::WrapperInfo kWrapperInfo;
-
- private:
-  DataReceiverFactory(const Callback& callback, v8::Isolate* isolate)
-      : callback_(callback), isolate_(isolate) {}
-
-  base::Callback<void(mojo::InterfaceRequest<device::serial::DataSource>,
-                      mojo::InterfacePtr<device::serial::DataSourceClient>)>
-      callback_;
-  v8::Isolate* isolate_;
-};
-
-gin::WrapperInfo DataReceiverFactory::kWrapperInfo = {gin::kEmbedderNativeGin};
-
 // Runs tests defined in extensions/test/data/data_receiver_unittest.js
 class DataReceiverTest : public ApiTestBase {
  public:
   DataReceiverTest() {}
 
   void SetUp() override {
     ApiTestBase::SetUp();
-    gin::ModuleRegistry::From(env()->context()->v8_context())
-        ->AddBuiltinModule(env()->isolate(),
-                           "device/serial/data_receiver_test_factory",
-                           DataReceiverFactory::Create(
-                               env()->isolate(),
-                               base::Bind(&DataReceiverTest::CreateDataSource,
-                                          base::Unretained(this))).ToV8());
+    service_provider()->AddService(base::Bind(
+        &DataReceiverTest::CreateDataSource, base::Unretained(this)));
   }
 
   void TearDown() override {
     if (sender_.get()) {
       sender_->ShutDown();
       sender_ = NULL;
     }
     ApiTestBase::TearDown();
   }
 
   std::queue<int32_t> error_to_send_;
   std::queue<std::string> data_to_send_;
 
  private:
   void CreateDataSource(
-      mojo::InterfaceRequest<device::serial::DataSource> request,
-      mojo::InterfacePtr<device::serial::DataSourceClient> client) {
-    sender_ = new device::DataSourceSender(
-        request.Pass(), client.Pass(),
-        base::Bind(&DataReceiverTest::ReadyToSend, base::Unretained(this)),
-        base::Bind(base::DoNothing));
+      mojo::InterfaceRequest<device::serial::DataSource> request) {
+    sender_ = mojo::WeakBindToRequest(
+        new device::DataSourceSender(
+            base::Bind(&DataReceiverTest::ReadyToSend, base::Unretained(this)),
+            base::Bind(base::DoNothing)),
+        &request);
   }
 
   void ReadyToSend(scoped_ptr<device::WritableBuffer> buffer) {
     if (data_to_send_.empty() && error_to_send_.empty())
       return;
 
     std::string data;
     int32_t error = 0;
     if (!data_to_send_.empty()) {
       data = data_to_send_.front();
@@ skipping 65 matching lines @@
   data_to_send_.push("a");
   RunTest("data_receiver_unittest.js", "testSerializeDuringReceive");
 }
 
 TEST_F(DataReceiverTest, SerializeAfterClose) {
   data_to_send_.push("a");
   RunTest("data_receiver_unittest.js", "testSerializeAfterClose");
 }
 
 }  // namespace extensions