Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1293)

Unified Diff: content/browser/frame_host/render_frame_host_impl.cc

Issue 2050803002: Better way to implement FrameConnectedBluetoothDevicesTest Base URL: https://chromium.googlesource.com/chromium/src.git@patch_ortuno
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/frame_host/render_frame_host_impl.h ('k') | content/test/test_render_frame_host.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/frame_host/render_frame_host_impl.cc
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
index f7d3b40074eeb7d0e01260b6d91c20fb432c1905..0b3beee3448b2e0731a2e584864a89ff6d772579 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -1963,9 +1963,9 @@ void RenderFrameHostImpl::RegisterMojoServices() {
#endif
if (enable_web_bluetooth) {
- GetServiceRegistry()->AddService(
- base::Bind(&RenderFrameHostImpl::CreateWebBluetoothService,
- base::Unretained(this)));
+ GetServiceRegistry()->AddService(base::Bind(
+ base::IgnoreResult(&RenderFrameHostImpl::CreateWebBluetoothService),
+ base::Unretained(this)));
}
if (!frame_mojo_shell_)
@@ -2800,7 +2800,7 @@ void RenderFrameHostImpl::AXContentTreeDataToAXTreeData(
dst->focused_tree_id = focused_frame->GetAXTreeID();
}
-void RenderFrameHostImpl::CreateWebBluetoothService(
+WebBluetoothServiceImpl* RenderFrameHostImpl::CreateWebBluetoothService(
blink::mojom::WebBluetoothServiceRequest request) {
DCHECK(!web_bluetooth_service_);
web_bluetooth_service_.reset(
@@ -2810,6 +2810,7 @@ void RenderFrameHostImpl::CreateWebBluetoothService(
// handler after it's destroyed so it can't run after the RFHI is destroyed.
web_bluetooth_service_->SetClientConnectionErrorHandler(base::Bind(
&RenderFrameHostImpl::DeleteWebBluetoothService, base::Unretained(this)));
+ return web_bluetooth_service_.get();
}
void RenderFrameHostImpl::DeleteWebBluetoothService() {
« no previous file with comments | « content/browser/frame_host/render_frame_host_impl.h ('k') | content/test/test_render_frame_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698