bluetooth: Move requestDevice to mojo

content/browser/renderer_host/render_process_host_impl.h

Index: content/browser/renderer_host/render_process_host_impl.h
diff --git a/content/browser/renderer_host/render_process_host_impl.h b/content/browser/renderer_host/render_process_host_impl.h
index e46e2c511257b92098a5282633d58b3f1f738b0e..e7f189f88069edd43f3c8222edbb83b86ad755a2 100644
--- a/content/browser/renderer_host/render_process_host_impl.h
+++ b/content/browser/renderer_host/render_process_host_impl.h
@@ -19,6 +19,7 @@
 #include "base/process/process.h"
 #include "base/synchronization/waitable_event.h"
 #include "build/build_config.h"
+#include "content/browser/bluetooth/bluetooth_adapter_factory_wrapper.h"
 #include "content/browser/child_process_launcher.h"
 #include "content/browser/dom_storage/session_storage_namespace_impl.h"
 #include "content/browser/power_monitor_message_broadcaster.h"
@@ -47,7 +48,6 @@ class ChannelMojoHost;
 namespace content {
 class AudioInputRendererHost;
 class AudioRendererHost;
-class BluetoothDispatcherHost;
 class BrowserCdmManager;
 class BrowserDemuxerAndroid;
 class InProcessChildThreadParams;
@@ -261,7 +261,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
   void GetAudioOutputControllers(
       const GetAudioOutputControllersCallback& callback) const override;
 
-  BluetoothDispatcherHost* GetBluetoothDispatcherHost();
+  BluetoothAdapterFactoryWrapper& GetBluetoothAdapterFactoryWrapper();

[ncarter (slow), 2016/05/25 21:19:18]

This ought to be a pointer, not a ref.

[Jeffrey Yasskin, 2016/05/25 21:31:02]

How come? Your comment is often a misunderstanding of the "no non-const
reference arguments" rule at
https://google.github.io/styleguide/cppguide.html#Reference_Arguments, which
doesn't say anything about return types, but you may have another reason.

I prefer a reference return because it's never null.

[ortuno, 2016/05/26 20:31:01]

I agree with jyasskin. The reference indicates users of the function that this
value will never be null.

[ncarter (slow), 2016/05/26 21:47:35]

I agree with you, that it isn't prohibited by the style guide. It struck me as
odd because the "ref means it can't be null" convention is uncommon in content/.
For example, this class has a bunch of pointer-valued function that can never be
null. They don't use references to indicate this. Doing it here seems
inconsistent with the surrounding code in content/browser.

I see:

https://goo.gl/6o1YMQ 487 pointer valued functions
https://goo.gl/W2jnWo 43 ref-valued functions
https://goo.gl/4pWAmQ of which 32 are const ref

Leaving 11 cases where we do this, vs 487 cases where we don't.

Having said that, this is the sort of style debate I absolutely loathe. You can
do it if it's really important to you.

[ncarter (slow), 2016/05/26 22:02:34]

Whoops, that last bit possibly came across too passive-agressive. What I mean
is: if you're not swayed by the consistency argument, then go ahead with the
non-const ref: the style guide is the ultimate arbiter here, and it says this is
legal.

[ortuno, 2016/05/27 02:53:25]

Consistency makes sense. I've changed the function to return a pointer.

 
 #if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
   // Launch the zygote early in the browser startup.
@@ -467,7 +467,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
 
   scoped_refptr<AudioInputRendererHost> audio_input_renderer_host_;
 
-  scoped_refptr<BluetoothDispatcherHost> bluetooth_dispatcher_host_;
+  BluetoothAdapterFactoryWrapper bluetooth_adapter_factory_wrapper_;
 
 #if defined(OS_ANDROID)
   scoped_refptr<BrowserDemuxerAndroid> browser_demuxer_android_;