Chromium Code Reviews| Index: content/browser/renderer_host/render_process_host_impl.cc |
| diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc |
| index c1f6ea58086569202275a28355b6d9c0927365a4..b36519456e3ad2bebc935bdeb6ef49727bd6bd9a 100644 |
| --- a/content/browser/renderer_host/render_process_host_impl.cc |
| +++ b/content/browser/renderer_host/render_process_host_impl.cc |
| @@ -51,7 +51,6 @@ |
| #include "content/browser/bad_message.h" |
| #include "content/browser/blob_storage/blob_dispatcher_host.h" |
| #include "content/browser/blob_storage/chrome_blob_storage_context.h" |
| -#include "content/browser/bluetooth/bluetooth_dispatcher_host.h" |
| #include "content/browser/browser_child_process_host_impl.h" |
| #include "content/browser/browser_main.h" |
| #include "content/browser/browser_main_loop.h" |
| @@ -810,8 +809,6 @@ std::unique_ptr<IPC::ChannelProxy> RenderProcessHostImpl::CreateChannelProxy( |
| void RenderProcessHostImpl::CreateMessageFilters() { |
| DCHECK_CURRENTLY_ON(BrowserThread::UI); |
| - const base::CommandLine& browser_command_line = |
| - *base::CommandLine::ForCurrentProcess(); |
| AddFilter(new ResourceSchedulerFilter(GetID())); |
| MediaInternals* media_internals = MediaInternals::GetInstance(); |
| media::AudioManager* audio_manager = |
| @@ -1002,17 +999,6 @@ void RenderProcessHostImpl::CreateMessageFilters() { |
| #if defined(OS_ANDROID) |
| AddFilter(new ScreenOrientationMessageFilterAndroid()); |
| #endif |
| - |
| - bool enable_web_bluetooth = |
| - browser_command_line.HasSwitch(switches::kEnableWebBluetooth); |
| -#if defined(OS_CHROMEOS) || defined(OS_ANDROID) |
| - enable_web_bluetooth = true; |
| -#endif |
| - |
| - if (enable_web_bluetooth) { |
| - bluetooth_dispatcher_host_ = new BluetoothDispatcherHost(GetID()); |
| - AddFilter(bluetooth_dispatcher_host_.get()); |
| - } |
| } |
| void RenderProcessHostImpl::RegisterMojoServices() { |
| @@ -2746,8 +2732,9 @@ void RenderProcessHostImpl::GetAudioOutputControllers( |
| audio_renderer_host()->GetOutputControllers(callback); |
| } |
| -BluetoothDispatcherHost* RenderProcessHostImpl::GetBluetoothDispatcherHost() { |
| - return bluetooth_dispatcher_host_.get(); |
| +BluetoothAdapterFactoryWrapper& |
| +RenderProcessHostImpl::GetBluetoothAdapterFactoryWrapper() { |
| + return bluetooth_adapter_factory_wrapper_; |
|
ncarter (slow)
2016/05/25 21:19:18
Given that you've removed the reset-on-process-rel
ortuno
2016/05/26 20:31:01
Done.
|
| } |
| void RenderProcessHostImpl::RecomputeAndUpdateWebKitPreferences() { |