| Index: chrome/renderer/chrome_render_thread_observer.cc
|
| diff --git a/chrome/renderer/chrome_render_thread_observer.cc b/chrome/renderer/chrome_render_thread_observer.cc
|
| index 32ed66bac4c4c75127ead53e4fdeea6ac4842ea0..694eee7c27e959bea9fed82a4fa2c73343ff5194 100644
|
| --- a/chrome/renderer/chrome_render_thread_observer.cc
|
| +++ b/chrome/renderer/chrome_render_thread_observer.cc
|
| @@ -238,7 +238,6 @@ bool ChromeRenderThreadObserver::is_incognito_process_ = false;
|
| ChromeRenderThreadObserver::ChromeRenderThreadObserver()
|
| : field_trial_syncer_(this),
|
| visited_link_slave_(new visitedlink::VisitedLinkSlave),
|
| - renderer_configuration_binding_(this),
|
| weak_factory_(this) {
|
| const base::CommandLine& command_line =
|
| *base::CommandLine::ForCurrentProcess();
|
| @@ -295,10 +294,6 @@ bool ChromeRenderThreadObserver::OnControlMessageReceived(
|
| bool handled = true;
|
| IPC_BEGIN_MESSAGE_MAP(ChromeRenderThreadObserver, message)
|
| IPC_MESSAGE_HANDLER(ChromeViewMsg_SetFieldTrialGroup, OnSetFieldTrialGroup)
|
| - // TODO(nigeltao): delete this handler when all senders of
|
| - // ChromeViewMsg_SetContentSettingRules have been converted to Mojo.
|
| - IPC_MESSAGE_HANDLER(ChromeViewMsg_SetContentSettingRules,
|
| - SetContentSettingRules)
|
| IPC_MESSAGE_UNHANDLED(handled = false)
|
| IPC_END_MESSAGE_MAP()
|
| return handled;
|
| @@ -308,8 +303,7 @@ void ChromeRenderThreadObserver::OnRenderProcessShutdown() {
|
| visited_link_slave_.reset();
|
|
|
| // Workaround for http://crbug.com/672646
|
| - if (renderer_configuration_binding_.is_bound())
|
| - renderer_configuration_binding_.Unbind();
|
| + renderer_configuration_bindings_.CloseAllBindings();
|
| }
|
|
|
| void ChromeRenderThreadObserver::OnFieldTrialGroupFinalized(
|
| @@ -333,8 +327,7 @@ void ChromeRenderThreadObserver::SetContentSettingRules(
|
|
|
| void ChromeRenderThreadObserver::OnRendererConfigurationAssociatedRequest(
|
| chrome::mojom::RendererConfigurationAssociatedRequest request) {
|
| - DCHECK(!renderer_configuration_binding_.is_bound());
|
| - renderer_configuration_binding_.Bind(std::move(request));
|
| + renderer_configuration_bindings_.AddBinding(this, std::move(request));
|
| }
|
|
|
| void ChromeRenderThreadObserver::OnSetFieldTrialGroup(
|
|
|