1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
|
description: fix mojo layout test build error
author: Michael Gilbert <mgilbert@debian.org>
--- a/mojo/public/tools/bindings/chromium_bindings_configuration.gni
+++ b/mojo/public/tools/bindings/chromium_bindings_configuration.gni
@@ -8,7 +8,6 @@ _typemap_imports = [
"//chrome/common/importer/typemaps.gni",
"//chrome/common/media_router/mojo/typemaps.gni",
"//chrome/typemaps.gni",
- "//chromecast/common/mojom/typemaps.gni",
"//chromeos/typemaps.gni",
"//chromeos/components/multidevice/mojom/typemaps.gni",
"//chromeos/services/secure_channel/public/mojom/typemaps.gni",
--- a/content/shell/BUILD.gn
+++ b/content/shell/BUILD.gn
@@ -145,8 +145,6 @@ jumbo_static_library("content_shell_lib"
"browser/web_test/fake_bluetooth_chooser.h",
"browser/web_test/leak_detector.cc",
"browser/web_test/leak_detector.h",
- "browser/web_test/mojo_web_test_helper.cc",
- "browser/web_test/mojo_web_test_helper.h",
"browser/web_test/secondary_test_window_observer.cc",
"browser/web_test/secondary_test_window_observer.h",
"browser/web_test/test_info_extractor.cc",
@@ -288,7 +286,6 @@ jumbo_static_library("content_shell_lib"
"//content/public/common:service_names",
"//content/shell/test_runner:test_runner",
"//content/test:content_test_mojo_bindings",
- "//content/test:mojo_web_test_bindings",
"//content/test:test_support",
"//content/test:web_test_support",
"//device/bluetooth",
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -971,7 +971,6 @@ if (!is_ios) {
":layout_test_data_mojo_bindings",
":layout_test_data_mojo_bindings_lite",
"//content/shell:content_shell",
- "//content/test:mojo_web_test_bindings_js_data_deps",
"//device/bluetooth/public/mojom:fake_bluetooth_interfaces_js_data_deps",
"//device/usb/public/mojom:mojom_js_data_deps",
"//device/vr/public/mojom:mojom_js_data_deps",
--- a/content/browser/service_manager/service_manager_context.cc
+++ b/content/browser/service_manager/service_manager_context.cc
@@ -85,8 +85,6 @@
#include "services/service_manager/sandbox/sandbox_type.h"
#include "services/service_manager/service_manager.h"
#include "services/shape_detection/public/mojom/constants.mojom.h"
-#include "services/tracing/public/mojom/constants.mojom.h"
-#include "services/tracing/tracing_service.h"
#include "services/video_capture/public/mojom/constants.mojom.h"
#include "services/video_capture/service_impl.h"
#include "services/viz/public/interfaces/constants.mojom.h"
@@ -391,11 +389,6 @@ std::unique_ptr<service_manager::Service
std::move(request));
}
-std::unique_ptr<service_manager::Service> CreateTracingService(
- service_manager::mojom::ServiceRequest request) {
- return std::make_unique<tracing::TracingService>(std::move(request));
-}
-
std::unique_ptr<service_manager::Service> CreateMediaSessionService(
service_manager::mojom::ServiceRequest request) {
return std::make_unique<media_session::MediaSessionService>(
@@ -587,11 +580,6 @@ ServiceManagerContext::ServiceManagerCon
base::BindRepeating(&CreateResourceCoordinatorService));
RegisterInProcessService(packaged_services_connection_.get(),
- tracing::mojom::kServiceName,
- service_manager_thread_task_runner_,
- base::BindRepeating(&CreateTracingService));
-
- RegisterInProcessService(packaged_services_connection_.get(),
metrics::mojom::kMetricsServiceName,
service_manager_thread_task_runner_,
base::BindRepeating(&metrics::CreateMetricsService));
--- a/content/browser/tracing/tracing_controller_impl.h
+++ b/content/browser/tracing/tracing_controller_impl.h
@@ -17,7 +17,6 @@
#include "content/common/content_export.h"
#include "content/public/browser/tracing_controller.h"
#include "mojo/public/cpp/system/data_pipe_drainer.h"
-#include "services/tracing/public/mojom/tracing.mojom.h"
namespace base {
@@ -95,7 +94,6 @@ class TracingControllerImpl
void CompleteFlush();
- tracing::mojom::CoordinatorPtr coordinator_;
std::vector<std::unique_ptr<tracing::BaseAgent>> agents_;
std::unique_ptr<TracingDelegate> delegate_;
std::unique_ptr<base::trace_event::TraceConfig> trace_config_;
--- a/content/shell/browser/web_test/web_test_content_browser_client.cc
+++ b/content/shell/browser/web_test/web_test_content_browser_client.cc
@@ -27,7 +27,6 @@
#include "content/shell/browser/shell_browser_context.h"
#include "content/shell/browser/web_test/blink_test_controller.h"
#include "content/shell/browser/web_test/fake_bluetooth_chooser.h"
-#include "content/shell/browser/web_test/mojo_web_test_helper.h"
#include "content/shell/browser/web_test/web_test_bluetooth_fake_adapter_setter_impl.h"
#include "content/shell/browser/web_test/web_test_browser_context.h"
#include "content/shell/browser/web_test/web_test_browser_main_parts.h"
@@ -47,11 +46,6 @@ namespace {
WebTestContentBrowserClient* g_web_test_browser_client;
-void BindWebTestHelper(mojom::MojoWebTestHelperRequest request,
- RenderFrameHost* render_frame_host) {
- MojoWebTestHelper::Create(std::move(request));
-}
-
class TestOverlayWindow : public OverlayWindow {
public:
TestOverlayWindow() = default;
@@ -155,7 +149,6 @@ void WebTestContentBrowserClient::Expose
&WebTestContentBrowserClient::CreateFakeBluetoothChooser,
base::Unretained(this)),
ui_task_runner);
- registry->AddInterface(base::BindRepeating(&MojoWebTestHelper::Create));
registry->AddInterface(
base::BindRepeating(&WebTestContentBrowserClient::BindClipboardHost,
base::Unretained(this)),
@@ -313,7 +306,6 @@ bool WebTestContentBrowserClient::CanIgn
void WebTestContentBrowserClient::ExposeInterfacesToFrame(
service_manager::BinderRegistryWithArgs<content::RenderFrameHost*>*
registry) {
- registry->AddInterface(base::Bind(&BindWebTestHelper));
}
scoped_refptr<LoginDelegate> WebTestContentBrowserClient::CreateLoginDelegate(
--- a/content/shell/browser/shell_content_browser_client.cc
+++ b/content/shell/browser/shell_content_browser_client.cc
@@ -47,7 +47,6 @@
#include "content/shell/common/web_test/fake_bluetooth_chooser.mojom.h"
#include "content/shell/common/web_test/web_test_bluetooth_fake_adapter_setter.mojom.h"
#include "content/shell/common/web_test/web_test_switches.h"
-#include "content/test/data/mojo_web_test_helper_test.mojom.h"
#include "device/bluetooth/public/mojom/test/fake_bluetooth.mojom.h"
#include "media/mojo/buildflags.h"
#include "net/ssl/client_cert_identity.h"
@@ -161,7 +160,7 @@ const service_manager::Manifest& GetCont
.ExposeCapability(
"renderer",
service_manager::Manifest::InterfaceList<
- mojom::MojoWebTestHelper, mojom::FakeBluetoothChooser,
+ mojom::FakeBluetoothChooser,
mojom::WebTestBluetoothFakeAdapterSetter,
bluetooth::mojom::FakeBluetooth>())
.RequireCapability(echo::mojom::kServiceName, "echo")
@@ -169,10 +168,6 @@ const service_manager::Manifest& GetCont
.RequireCapability(ws::mojom::kServiceName, "test")
.RequireCapability("test_ws", "test")
#endif
- .ExposeInterfaceFilterCapability_Deprecated(
- "navigation:frame", "renderer",
- service_manager::Manifest::InterfaceList<
- mojom::MojoWebTestHelper>())
.Build()
};
return *manifest;
|
