[Fuchsia] Add service_directory field in CreateContextParams

Now a process that creates a WebContext must pass a service_directory
handle. That directory is mounted as /svc in the context process.

Also renamed dataDirectory->data_directory, which is a proper struct
member name according to the FIDL style guide.

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

webrunner/app/main.cc

@@ -6,7 +6,9 @@
 #include <lib/fidl/cpp/binding.h>
 #include <utility>
 
+#include "base/files/file.h"
 #include "base/fuchsia/component_context.h"
+#include "base/fuchsia/file_utils.h"
 #include "base/fuchsia/scoped_service_binding.h"
 #include "base/fuchsia/service_directory.h"
 #include "base/logging.h"
@@ -22,7 +24,15 @@ chromium::web::ContextPtr CreateContext() {
   auto web_context_provider =
       base::fuchsia::ComponentContext::GetDefault()
           ->ConnectToService<chromium::web::ContextProvider>();
+
   chromium::web::CreateContextParams create_params;
+
+  // Clone /svc to the context.
+  create_params.service_directory =
+      zx::channel(base::fuchsia::GetHandleFromFile(
+          base::File(base::FilePath("/svc"),
+                     base::File::FLAG_OPEN | base::File::FLAG_READ)));
+
   chromium::web::ContextPtr web_context;
   web_context_provider->Create(std::move(create_params),
                                web_context.NewRequest());

webrunner/fidl/context_provider.fidl

@@ -17,8 +17,13 @@ interface ContextProvider {
 };
 
 struct CreateContextParams {
+  // Service directory to be used by the context.
+  // TODO(https://crbug.com/870057): Document required and optional services
+  // that Context needs.
+  handle<channel> service_directory;
+
   // Handle to the directory that will contain the Context's
   // persistent data. If it is left unset, then the created Context will be
   // stateless, with all of its data discarded upon Context destruction.
-  handle<channel>? dataDirectory;
+  handle<channel>? data_directory;
 };

webrunner/service/context_provider_impl.cc

@@ -67,22 +67,21 @@ void ContextProviderImpl::Create(
   // Context needs access to the read-only SSL root certificates list.
   launch_options.paths_to_clone.push_back(base::FilePath("/config/ssl"));
 
-  // The context process needs /svc to connect to environment services.
-  // TODO(https://crbug.com/869216): Don't clone /svc. Instead it should be
-  // passed in CreateContextParams.
-  launch_options.paths_to_clone.push_back(base::FilePath("/svc"));
-
   // Transfer the ContextRequest handle to a well-known location in the child
   // process' handle table.
   zx::channel context_handle(context_request.TakeChannel());
   launch_options.handles_to_transfer.push_back(
       {kContextRequestHandleId, context_handle.get()});
 
+  // Pass /svc directory specified by the caller.
+  launch_options.paths_to_transfer.push_back(base::PathToTransfer{
+      base::FilePath("/svc"), std::move(params.service_directory.release())});
+
   // Pass the data directory. If there is no data dir then --incognito flag is
   // added instead.
-  if (params.dataDirectory) {
+  if (params.data_directory) {
     launch_options.paths_to_transfer.push_back(base::PathToTransfer{
-        base::FilePath(kWebContextDataPath), params.dataDirectory.release()});
+        base::FilePath(kWebContextDataPath), params.data_directory.release()});
   } else {
     launch_command.AppendSwitch(kIncognitoSwitch);
   }

webrunner/service/context_provider_impl_unittest.cc

@@ -211,7 +211,7 @@ TEST_F(ContextProviderImplTest, WithProfileDir) {
       0);
 
   // Pass a handle data dir to the context.
-  create_params.dataDirectory.reset(
+  create_params.data_directory.reset(
       base::fuchsia::GetHandleFromFile(
           base::File(profile_temp_dir.GetPath(),
                      base::File::FLAG_OPEN | base::File::FLAG_READ))