Remove use of blink::InterfaceRegistry from RenderThreadImpl
This is unnecessary now that Blink code can freely use
service_manager client library APIs.
It's also incorrect since content::BlinkInterfaceRegistryImpl
uses an internal WeakPtr to the underlying BinderRegistry on
the main thread, while the BinderRegistry actually lives on the
IO thread.
This does not create any problematic races in practice since
usage on the main thread is guaranteed to preceed movement to
the IO thread, but it does violate the usage constraints of
WeakPtrFactory and triggers DCHECKs.
BUG=789064
Change-Id: Id491e7f126c861220d4b2c3b85ad25fd6384a1f5
Reviewed-on: https://chromium-review.googlesource.com/807265
Reviewed-by: Daniel Cheng <[email protected]>
Reviewed-by: John Abd-El-Malek <[email protected]>
Reviewed-by: Kentaro Hara <[email protected]>
Commit-Queue: Ken Rockot <[email protected]>
Cr-Commit-Position: refs/heads/master@{#521714}diff --git a/content/renderer/render_thread_impl.h b/content/renderer/render_thread_impl.h
index 3fbced7a..379bdd3 100644
--- a/content/renderer/render_thread_impl.h
+++ b/content/renderer/render_thread_impl.h
@@ -54,6 +54,7 @@
#include "net/base/network_change_notifier.h"
#include "net/nqe/effective_connection_type.h"
#include "services/service_manager/public/cpp/bind_source_info.h"
+#include "services/service_manager/public/cpp/binder_registry.h"
#include "services/viz/public/interfaces/compositing/compositing_mode_watcher.mojom.h"
#include "third_party/WebKit/public/platform/WebConnectionType.h"
#include "third_party/WebKit/public/platform/scheduler/renderer/renderer_scheduler.h"
@@ -70,7 +71,6 @@
namespace scheduler {
class WebThreadBase;
}
-class InterfaceRegistry;
class WebMediaStreamCenter;
class WebMediaStreamCenterClient;
}
@@ -582,7 +582,7 @@
void InitializeWebKit(
const scoped_refptr<base::SingleThreadTaskRunner>& resource_task_queue,
- blink::InterfaceRegistry* registry);
+ service_manager::BinderRegistry* registry);
void OnTransferBitmap(const SkBitmap& bitmap, int resource_id);
void OnGetAccessibilityTree();
