[Fuchsia] Add Context, Frame stubs; implement service glue.

* Add ContextImpl service.
* Add FrameImpl service.
* Add support for exiting after final disconnect to ContextProvider.
* Add Context process startup logic to main.cc.
* Rename webrunner_main.cc to web_context_service_main.cc.

Bug: 852145
Change-Id: I87228259472cc0ef1044ea3e00f94de9a0f61990
Reviewed-on: https://chromium-review.googlesource.com/1114321
Commit-Queue: Sergey Ulanov <sergeyu@chromium.org>
Reviewed-by: Wez <wez@chromium.org>
Cr-Commit-Position: refs/heads/master@{#574445}

webrunner/BUILD.gn

@@ -47,7 +47,7 @@ executable("runner_exe") {
 group("webrunner") {
   testonly = true
   deps = [
-    ":service_exe",
+    ":service_pkg",
     ":service_unittests",
   ]
 }
@@ -112,8 +112,12 @@ component("service_lib") {
     "common/webrunner_content_client.cc",
     "common/webrunner_content_client.h",
     "common/webrunner_export.h",
-    "service/context_provider/context_provider_impl.cc",
-    "service/context_provider/context_provider_impl.h",
+    "service/context_impl.cc",
+    "service/context_impl.h",
+    "service/context_provider_impl.cc",
+    "service/context_provider_impl.h",
+    "service/frame_impl.cc",
+    "service/frame_impl.h",
     "service/switches.cc",
     "service/switches.h",
     "service/webrunner_main_delegate.cc",
@@ -161,7 +165,7 @@ repack("service_pak") {
 
 test("service_unittests") {
   sources = [
-    "service/context_provider/context_provider_impl_unittest.cc",
+    "service/context_provider_impl_unittest.cc",
   ]
   deps = [
     ":fidl",

webrunner/service/common.h

+// Copyright 2018 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 WEBRUNNER_SERVICE_COMMON_H_
+#define WEBRUNNER_SERVICE_COMMON_H_
+
+#include <zircon/processargs.h>
+
+namespace webrunner {
+
+const uint32_t kContextRequestHandleId = PA_HND(PA_USER0, 0);
+
+}  // namespace webrunner
+
+#endif  // WEBRUNNER_SERVICE_COMMON_H_

webrunner/service/context_impl.cc

+// Copyright 2018 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 "webrunner/service/context_impl.h"
+
+#include <memory>
+#include <utility>
+
+#include "webrunner/service/frame_impl.h"
+
+namespace webrunner {
+
+ContextImpl::ContextImpl() = default;
+
+ContextImpl::~ContextImpl() = default;
+
+void ContextImpl::CreateFrame(
+    ::fidl::InterfaceHandle<chromium::web::FrameObserver> observer,
+    ::fidl::InterfaceRequest<chromium::web::Frame> frame_request) {
+  std::unique_ptr<chromium::web::Frame> frame =
+      std::make_unique<FrameImpl>(observer.Bind());
+  frame_bindings_.AddBinding(std::move(frame), std::move(frame_request));
+}
+
+}  // namespace webrunner

webrunner/service/context_impl.h

+// Copyright 2018 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 WEBRUNNER_SERVICE_CONTEXT_IMPL_H_
+#define WEBRUNNER_SERVICE_CONTEXT_IMPL_H_
+
+#include <lib/fidl/cpp/binding_set.h>
+#include <memory>
+
+#include "base/macros.h"
+#include "chromium/web/cpp/fidl.h"
+#include "webrunner/common/webrunner_export.h"
+
+namespace webrunner {
+
+// Implementation of Context from //webrunner/fidl/context.fidl.
+// Owns a BrowserContext instance and uses it to create new WebContents/Frames.
+// All created Frames are owned by this object.
+class WEBRUNNER_EXPORT ContextImpl : public chromium::web::Context {
+ public:
+  ContextImpl();
+
+  // Tears down the Context, destroying any active Frames in the process.
+  ~ContextImpl() override;
+
+  // chromium::web::Context implementation.
+  void CreateFrame(
+      ::fidl::InterfaceHandle<chromium::web::FrameObserver> observer,
+      ::fidl::InterfaceRequest<chromium::web::Frame> frame) override;
+
+ private:
+  fidl::BindingSet<chromium::web::Frame, std::unique_ptr<chromium::web::Frame>>
+      frame_bindings_;
+
+  DISALLOW_COPY_AND_ASSIGN(ContextImpl);
+};
+
+}  // namespace webrunner
+
+#endif  // WEBRUNNER_SERVICE_CONTEXT_IMPL_H_

webrunner/service/context_provider/context_provider_impl.cc → webrunner/service/context_provider_impl.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webrunner/service/context_provider/context_provider_impl.h"
+#include "webrunner/service/context_provider_impl.h"
 
 #include <fuchsia/sys/cpp/fidl.h>
 #include <lib/zx/job.h>
@@ -17,6 +17,7 @@
 #include "base/fuchsia/fuchsia_logging.h"
 #include "base/logging.h"
 #include "base/process/launch.h"
+#include "webrunner/service/common.h"
 #include "webrunner/service/switches.h"
 
 namespace webrunner {
@@ -58,7 +59,7 @@ void ContextProviderImpl::Create(
   base::LaunchOptions launch_options;
   zx::channel context_handle(context_request.TakeChannel());
   launch_options.handles_to_transfer.push_back(
-      {PA_HND(PA_USER0, 0), context_handle.get()});
+      {kContextRequestHandleId, context_handle.get()});
 
   // Isolate the child Context processes by containing them within their own
   // respective jobs.

webrunner/service/context_provider/context_provider_impl.h → webrunner/service/context_provider_impl.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBRUNNER_SERVICE_CONTEXT_PROVIDER_CONTEXT_PROVIDER_IMPL_H_
-#define WEBRUNNER_SERVICE_CONTEXT_PROVIDER_CONTEXT_PROVIDER_IMPL_H_
+#ifndef WEBRUNNER_SERVICE_CONTEXT_PROVIDER_IMPL_H_
+#define WEBRUNNER_SERVICE_CONTEXT_PROVIDER_IMPL_H_
 
 #include <lib/fidl/cpp/binding_set.h>
 
@@ -55,4 +55,4 @@ class WEBRUNNER_EXPORT ContextProviderImpl
 
 }  // namespace webrunner
 
-#endif  // WEBRUNNER_SERVICE_CONTEXT_PROVIDER_CONTEXT_PROVIDER_IMPL_H_
+#endif  // WEBRUNNER_SERVICE_CONTEXT_PROVIDER_IMPL_H_

webrunner/service/context_provider/context_provider_impl_unittest.cc → webrunner/service/context_provider_impl_unittest.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webrunner/service/context_provider/context_provider_impl.h"
+#include "webrunner/service/context_provider_impl.h"
 
 #include <lib/fidl/cpp/binding.h>
 #include <zircon/processargs.h>
@@ -12,31 +12,42 @@
 
 #include "base/base_switches.h"
 #include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/files/file.h"
 #include "base/fuchsia/file_utils.h"
 #include "base/message_loop/message_loop.h"
 #include "base/test/multiprocess_test.h"
-#include "testing/gmock/include/gmock/gmock-actions.h"
-#include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/multiprocess_func_list.h"
+#include "webrunner/service/common.h"
 
 namespace webrunner {
 namespace {
 
-class MockFrameObserver : public chromium::web::FrameObserver {
+class TestFrameObserver : public chromium::web::FrameObserver {
  public:
   void OnNavigationStateChanged(
       chromium::web::NavigationStateChangeDetails change,
       OnNavigationStateChangedCallback callback) override {
-    OnNavigationStateChanged();
+    last_change_ = change;
+    if (change_callback_)
+      std::move(change_callback_).Run();
+    callback();
   }
 
-  MOCK_METHOD0(OnNavigationStateChanged, void(void));
-};
+  void SetNextChangeCallback(base::OnceClosure callback) {
+    change_callback_ = std::move(callback);
+  }
+
+  chromium::web::NavigationStateChangeDetails last_change() {
+    return last_change_;
+  }
 
-void DoNothing() {}
+ private:
+  chromium::web::NavigationStateChangeDetails last_change_ = {};
+  base::OnceClosure change_callback_;
+};
 
 class FakeContext : public chromium::web::Context {
  public:
@@ -44,22 +55,27 @@ class FakeContext : public chromium::web::Context {
       ::fidl::InterfaceHandle<chromium::web::FrameObserver> observer,
       ::fidl::InterfaceRequest<chromium::web::Frame> frame) override {
     chromium::web::NavigationStateChangeDetails details;
+    details.url_changed = true;
     details.entry.url = "";
     details.entry.title = "";
-    observer.Bind()->OnNavigationStateChanged(details, &DoNothing);
+    observer.Bind()->OnNavigationStateChanged(details, []() {});
   }
 };
 
 MULTIPROCESS_TEST_MAIN(SpawnContextServer) {
   base::MessageLoopForIO message_loop;
   FakeContext fake_context;
-  zx_handle_t context_handle = zx_take_startup_handle(PA_HND(PA_USER0, 0));
-  CHECK_NE(ZX_HANDLE_INVALID, context_handle);
+  zx::channel context_handle{zx_take_startup_handle(kContextRequestHandleId)};
+  CHECK(context_handle);
   fidl::Binding<chromium::web::Context> binding(&fake_context,
-                                                zx::channel(context_handle));
+                                                std::move(context_handle));
 
-  // Service the MessageLoop until the child process is torn down.
-  base::RunLoop().Run();
+  base::RunLoop run_loop;
+
+  // Quit the process when the context is destroyed.
+  binding.set_error_handler([&run_loop]() { run_loop.Quit(); });
+
+  run_loop.Run();
   return 0;
 }
 
@@ -72,12 +88,10 @@ class ContextProviderImplTest : public base::MultiProcessTest {
         &ContextProviderImplTest::LaunchProcess, base::Unretained(this)));
     provider_.Bind(provider_ptr_.NewRequest());
   }
-  ~ContextProviderImplTest() override = default;
 
-  void TearDown() override {
-    for (auto& process : context_processes_) {
-      process.Terminate(0, true);
-    }
+  ~ContextProviderImplTest() override {
+    provider_ptr_.Unbind();
+    base::RunLoop().RunUntilIdle();
   }
 
   // Start a new child process whose main function is defined in
@@ -86,9 +100,8 @@ class ContextProviderImplTest : public base::MultiProcessTest {
     auto cmdline = base::GetMultiProcessTestChildBaseCommandLine();
     cmdline.AppendSwitchASCII(switches::kTestChildProcess,
                               "SpawnContextServer");
-    auto context_process = base::LaunchProcess(cmdline, options);
+    base::Process context_process = base::LaunchProcess(cmdline, options);
     EXPECT_TRUE(context_process.IsValid());
-    context_processes_.push_back(context_process.Duplicate());
     return context_process;
   }
 
@@ -98,59 +111,52 @@ class ContextProviderImplTest : public base::MultiProcessTest {
   ContextProviderImpl provider_;
   chromium::web::ContextProviderPtr provider_ptr_;
 
-  // The spawned Process object for a Context.
-  std::vector<base::Process> context_processes_;
-
  private:
   DISALLOW_COPY_AND_ASSIGN(ContextProviderImplTest);
 };
 
 TEST_F(ContextProviderImplTest, LaunchContext) {
   // Connect to a new context process.
-  auto data_dir = base::fuchsia::GetHandleFromFile(base::File(
-      base::FilePath("/data"), base::File::FLAG_OPEN | base::File::FLAG_READ));
   fidl::InterfacePtr<chromium::web::Context> context;
   chromium::web::CreateContextParams create_params;
   provider_ptr_->Create(std::move(create_params), context.NewRequest());
 
   // Call a Context method and wait for it to invoke an observer call.
-  MockFrameObserver frame_observer;
+  TestFrameObserver frame_observer;
   chromium::web::FramePtr frame_ptr;
   fidl::Binding<chromium::web::FrameObserver> frame_observer_binding(
       &frame_observer);
-  base::RunLoop r;
-  EXPECT_CALL(frame_observer, OnNavigationStateChanged())
-      .WillOnce(testing::Invoke(&r, &base::RunLoop::Quit));
+  base::RunLoop run_loop;
+  frame_observer.SetNextChangeCallback(run_loop.QuitClosure());
   context->CreateFrame(frame_observer_binding.NewBinding(),
                        frame_ptr.NewRequest());
-  r.Run();
+  run_loop.Run();
+
+  EXPECT_TRUE(frame_observer.last_change().url_changed ||
+              frame_observer.last_change().title_changed);
 }
 
+// Verify that there can be more than one connection to the provider.
 TEST_F(ContextProviderImplTest, MultipleClients) {
-  {
-    chromium::web::ContextProviderPtr provider_2_ptr;
-    provider_.Bind(provider_2_ptr.NewRequest());
-
-    // Allow provider_2_ptr to go out of scope and disconnect.
-  }
+  chromium::web::ContextProviderPtr provider_1_ptr;
+  provider_.Bind(provider_1_ptr.NewRequest());
 
-  // Connect with a third client.
-  chromium::web::ContextProviderPtr provider_3_ptr;
-  provider_.Bind(provider_3_ptr.NewRequest());
+  // Connect a second client.
+  chromium::web::ContextProviderPtr provider_2_ptr;
+  provider_.Bind(provider_2_ptr.NewRequest());
   fidl::InterfacePtr<chromium::web::Context> context;
   chromium::web::CreateContextParams create_params;
-  provider_3_ptr->Create(std::move(create_params), context.NewRequest());
+  provider_2_ptr->Create(std::move(create_params), context.NewRequest());
 
-  MockFrameObserver frame_observer;
+  TestFrameObserver frame_observer;
   chromium::web::FramePtr frame_ptr;
   fidl::Binding<chromium::web::FrameObserver> frame_observer_binding(
       &frame_observer);
-  base::RunLoop r;
-  EXPECT_CALL(frame_observer, OnNavigationStateChanged())
-      .WillOnce(testing::Invoke(&r, &base::RunLoop::Quit));
+  base::RunLoop run_loop;
+  frame_observer.SetNextChangeCallback(run_loop.QuitClosure());
   context->CreateFrame(frame_observer_binding.NewBinding(),
                        frame_ptr.NewRequest());
-  r.Run();
+  run_loop.Run();
 }
 
 }  // namespace webrunner

webrunner/service/frame_impl.cc

+// Copyright 2018 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 "webrunner/service/frame_impl.h"
+
+#include "base/logging.h"
+
+namespace webrunner {
+
+FrameImpl::FrameImpl(chromium::web::FrameObserverPtr observer)
+    : observer_(std::move(observer)) {}
+
+FrameImpl::~FrameImpl() = default;
+
+void FrameImpl::CreateView(
+    ::fidl::InterfaceRequest<fuchsia::ui::views_v1_token::ViewOwner> view_owner,
+    ::fidl::InterfaceRequest<fuchsia::sys::ServiceProvider> services) {
+  NOTIMPLEMENTED();
+}
+
+void FrameImpl::GetNavigationController(
+    ::fidl::InterfaceRequest<chromium::web::NavigationController> controller) {
+  controller_bindings_.AddBinding(this, std::move(controller));
+}
+
+void FrameImpl::LoadUrl(
+    ::fidl::StringPtr url,
+    ::std::unique_ptr<chromium::web::LoadUrlParams> params) {
+  NOTIMPLEMENTED() << "Loading URL " << *url;
+}
+
+void FrameImpl::GoBack() {
+  NOTIMPLEMENTED();
+}
+
+void FrameImpl::GoForward() {
+  NOTIMPLEMENTED();
+}
+
+void FrameImpl::Stop() {
+  NOTIMPLEMENTED();
+}
+
+void FrameImpl::Reload() {
+  NOTIMPLEMENTED();
+}
+
+void FrameImpl::GetVisibleEntry(GetVisibleEntryCallback callback) {
+  NOTIMPLEMENTED();
+  callback(nullptr);
+}
+
+}  // namespace webrunner

webrunner/service/frame_impl.h

+// Copyright 2018 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 WEBRUNNER_SERVICE_FRAME_IMPL_H_
+#define WEBRUNNER_SERVICE_FRAME_IMPL_H_
+
+#include <lib/fidl/cpp/binding_set.h>
+#include <memory>
+#include <utility>
+
+#include "base/macros.h"
+#include "chromium/web/cpp/fidl.h"
+
+namespace webrunner {
+
+// Implementation of Frame from //webrunner/fidl/frame.fidl.
+// Implements a Frame service, which is a wrapper for a WebContents instance.
+class FrameImpl : public chromium::web::Frame,
+                  public chromium::web::NavigationController {
+ public:
+  explicit FrameImpl(chromium::web::FrameObserverPtr observer);
+  ~FrameImpl() override;
+
+  // chromium::web::Frame implementation.
+  void CreateView(
+      ::fidl::InterfaceRequest<fuchsia::ui::views_v1_token::ViewOwner>
+          view_owner,
+      ::fidl::InterfaceRequest<fuchsia::sys::ServiceProvider> services)
+      override;
+  void GetNavigationController(
+      ::fidl::InterfaceRequest<chromium::web::NavigationController> controller)
+      override;
+
+  // chromium::web::NavigationController implementation.
+  void LoadUrl(::fidl::StringPtr url,
+               ::std::unique_ptr<chromium::web::LoadUrlParams> params) override;
+  void GoBack() override;
+  void GoForward() override;
+  void Stop() override;
+  void Reload() override;
+  void GetVisibleEntry(GetVisibleEntryCallback callback) override;
+
+ private:
+  chromium::web::FrameObserverPtr observer_;
+  fidl::BindingSet<chromium::web::NavigationController> controller_bindings_;
+
+  DISALLOW_COPY_AND_ASSIGN(FrameImpl);
+};
+
+}  // namespace webrunner
+
+#endif  // WEBRUNNER_SERVICE_FRAME_IMPL_H_