html_viewer/web_view: An app for running layout-tests.

components/web_view/frame_connection.cc

 // Copyright 2015 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 "components/web_view/frame_connection.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "components/clipboard/public/interfaces/clipboard.mojom.h"
 #include "components/resource_provider/public/interfaces/resource_provider.mojom.h"
 #include "components/view_manager/public/interfaces/gpu.mojom.h"
 #include "components/view_manager/public/interfaces/view_tree_host.mojom.h"
 #include "components/web_view/frame_tree.h"
+#include "components/web_view/test_runner/public/interfaces/layout_test_runner.mojom.h"
 #include "mojo/application/public/cpp/application_connection.h"
 #include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/services/network/public/interfaces/cookie_store.mojom.h"
 #include "mojo/services/network/public/interfaces/url_loader_factory.mojom.h"
 #include "mojo/services/network/public/interfaces/web_socket_factory.mojom.h"
 #include "mojo/services/tracing/public/interfaces/tracing.mojom.h"
 
 #if defined(OS_LINUX) && !defined(OS_ANDROID)
 #include "components/font_service/public/interfaces/font_service.mojom.h"
 #endif
@@ skipping 63 matching lines @@
 
   mojo::Array<mojo::String> tracing_interfaces;
   tracing_interfaces.push_back(tracing::StartupPerformanceDataCollector::Name_);
   filter->filter.insert("mojo:tracing", tracing_interfaces.Pass());
 
   mojo::Array<mojo::String> view_manager_interfaces;
   view_manager_interfaces.push_back(mojo::Gpu::Name_);
   view_manager_interfaces.push_back(mojo::ViewTreeHostFactory::Name_);
   filter->filter.insert("mojo:view_manager", view_manager_interfaces.Pass());
 
+  mojo::Array<mojo::String> test_runner_interfaces;

[sky, 2015/09/04 14:56:04]

Do you think we should only do this in certain situations? Say a command line
switch?

[sadrul, 2015/09/04 21:16:03]

Not sure ... probably not? I can't think of a case where that would be
useful/necessary.

+  test_runner_interfaces.push_back(LayoutTestRunner::Name_);
+  filter->filter.insert("mojo:web_view_test_runner",
+                        test_runner_interfaces.Pass());
+
 #if defined(OS_LINUX) && !defined(OS_ANDROID)
   mojo::Array<mojo::String> font_service_interfaces;
   font_service_interfaces.push_back(font_service::FontService::Name_);
   filter->filter.insert("mojo:font_service", font_service_interfaces.Pass());
 #endif
 
   application_connection_ = app->ConnectToApplicationWithCapabilityFilter(
       request.Pass(), filter.Pass());
   application_connection_->ConnectToService(&frame_tree_client_);
   frame_tree_client_.set_connection_error_handler([]() {
@@ skipping 12 matching lines @@
 }
 
 uint32_t FrameConnection::GetContentHandlerID() const {
   uint32_t content_handler_id = mojo::Shell::kInvalidContentHandlerID;
   if (!application_connection_->GetContentHandlerID(&content_handler_id))
     NOTREACHED();
   return content_handler_id;
 }
 
 }  // namespace web_view