Migrate RenderThreadImpl to use ConnectionFilter instead of the ChildThread's InterfaceRegistry to …

components/web_cache/renderer/web_cache_impl.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/web_cache/renderer/web_cache_impl.h"
 
 #include <limits>
 
 #include "base/bind.h"
 #include "base/numerics/safe_conversions.h"
+#include "content/public/child/child_thread.h"
+#include "content/public/common/service_manager_connection.h"
+#include "content/public/common/simple_connection_filter.h"
 #include "content/public/renderer/render_thread.h"
-#include "services/service_manager/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/binder_registry.h"
 #include "third_party/WebKit/public/platform/WebCache.h"
 
 namespace web_cache {
 
 WebCacheImpl::WebCacheImpl() : clear_cache_state_(kInit) {
-  service_manager::InterfaceRegistry* registry =
-      content::RenderThread::Get()->GetInterfaceRegistry();
+  auto registry = base::MakeUnique<service_manager::BinderRegistry>();
   registry->AddInterface(
-      base::Bind(&WebCacheImpl::BindRequest, base::Unretained(this)));
+      base::Bind(&WebCacheImpl::BindRequest, base::Unretained(this)),
+      base::ThreadTaskRunnerHandle::Get());
+  if (content::ChildThread::Get()) {
+    content::ChildThread::Get()
+        ->GetServiceManagerConnection()
+        ->AddConnectionFilter(base::MakeUnique<content::SimpleConnectionFilter>(
+            std::move(registry)));
+  }
 }
 
 WebCacheImpl::~WebCacheImpl() {}
 
-void WebCacheImpl::BindRequest(
-    mojo::InterfaceRequest<mojom::WebCache> web_cache_request) {
+void WebCacheImpl::BindRequest(mojom::WebCacheRequest web_cache_request) {
   bindings_.AddBinding(this, std::move(web_cache_request));
 }
 
 void WebCacheImpl::ExecutePendingClearCache() {
   switch (clear_cache_state_) {
     case kInit:
       clear_cache_state_ = kNavigate_Pending;
       break;
     case kNavigate_Pending:
       break;
@@ skipping 23 matching lines @@
     case kNavigate_Pending:
       blink::WebCache::Clear();
       clear_cache_state_ = kInit;
       break;
     case kClearCache_Pending:
       break;
   }
 }
 
 }  // namespace web_cache