description: fix mojo layout test build error
author: Michael Gilbert <mgilbert@debian.org>

--- a/content/shell/BUILD.gn
+++ b/content/shell/BUILD.gn
@@ -125,8 +125,6 @@ jumbo_static_library("content_shell_lib"
     "browser/layout_test/layout_test_url_request_context_getter.h",
     "browser/layout_test/leak_detector.cc",
     "browser/layout_test/leak_detector.h",
-    "browser/layout_test/mojo_layout_test_helper.cc",
-    "browser/layout_test/mojo_layout_test_helper.h",
     "browser/layout_test/secondary_test_window_observer.cc",
     "browser/layout_test/secondary_test_window_observer.h",
     "browser/layout_test/test_info_extractor.cc",
@@ -289,9 +287,7 @@ jumbo_static_library("content_shell_lib"
     "//content/public/common",
     "//content/public/common:service_names",
     "//content/shell/test_runner:test_runner",
-    "//content/test:content_test_mojo_bindings",
     "//content/test:layouttest_support",
-    "//content/test:mojo_layouttest_bindings",
     "//content/test:test_support",
     "//device/bluetooth",
     "//device/bluetooth:fake_bluetooth",
--- a/content/shell/browser/layout_test/layout_test_content_browser_client.cc
+++ b/content/shell/browser/layout_test/layout_test_content_browser_client.cc
@@ -30,7 +30,6 @@
 #include "content/shell/browser/layout_test/layout_test_browser_context.h"
 #include "content/shell/browser/layout_test/layout_test_browser_main_parts.h"
 #include "content/shell/browser/layout_test/layout_test_message_filter.h"
-#include "content/shell/browser/layout_test/mojo_layout_test_helper.h"
 #include "content/shell/browser/shell_browser_context.h"
 #include "content/shell/common/layout_test/layout_test_switches.h"
 #include "content/shell/common/shell_messages.h"
@@ -47,11 +46,6 @@ namespace {
 
 LayoutTestContentBrowserClient* g_layout_test_browser_client;
 
-void BindLayoutTestHelper(mojom::MojoLayoutTestHelperRequest request,
-                          RenderFrameHost* render_frame_host) {
-  MojoLayoutTestHelper::Create(std::move(request));
-}
-
 class TestOverlayWindow : public OverlayWindow {
  public:
   TestOverlayWindow() = default;
@@ -157,7 +151,6 @@ void LayoutTestContentBrowserClient::Exp
           &LayoutTestContentBrowserClient::CreateFakeBluetoothChooser,
           base::Unretained(this)),
       ui_task_runner);
-  registry->AddInterface(base::BindRepeating(&MojoLayoutTestHelper::Create));
   registry->AddInterface(
       base::BindRepeating(&LayoutTestContentBrowserClient::BindClipboardHost,
                           base::Unretained(this)),
@@ -314,7 +307,6 @@ bool LayoutTestContentBrowserClient::Can
 void LayoutTestContentBrowserClient::ExposeInterfacesToFrame(
     service_manager::BinderRegistryWithArgs<content::RenderFrameHost*>*
         registry) {
-  registry->AddInterface(base::Bind(&BindLayoutTestHelper));
 }
 
 scoped_refptr<LoginDelegate>
--- a/chromecast/common/mojom/typemaps.gni
+++ b/chromecast/common/mojom/typemaps.gni
@@ -2,4 +2,4 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-typemaps = [ "//chromecast/common/mojom/multiroom.typemap" ]
+typemaps = [ ]