Convert UtilityThread/Clients to add ConnectionFilters instead of using ChildThread's InterfaceRegi…

extensions/utility/utility_handler.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 "extensions/utility/utility_handler.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "content/public/utility/utility_thread.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension_l10n_util.h"
 #include "extensions/common/extension_unpacker.mojom.h"
 #include "extensions/common/extensions_client.h"
 #include "extensions/common/manifest.h"
 #include "extensions/common/manifest_parser.mojom.h"
 #include "extensions/common/update_manifest.h"
 #include "extensions/strings/grit/extensions_strings.h"
 #include "extensions/utility/unpacker.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
-#include "services/service_manager/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/binder_registry.h"
 #include "third_party/zlib/google/zip.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/ui_base_switches.h"
 
 namespace extensions {
 
 namespace {
 
 class ExtensionUnpackerImpl : public extensions::mojom::ExtensionUnpacker {
  public:
@@ skipping 96 matching lines @@
 
 namespace utility_handler {
 
 void UtilityThreadStarted() {
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   std::string lang = command_line->GetSwitchValueASCII(switches::kLang);
   if (!lang.empty())
     extension_l10n_util::SetProcessLocale(lang);
 }
 
-void ExposeInterfacesToBrowser(service_manager::InterfaceRegistry* registry,
+void ExposeInterfacesToBrowser(service_manager::BinderRegistry* registry,
                                bool running_elevated) {
   // If our process runs with elevated privileges, only add elevated Mojo
   // interfaces to the interface registry.
   if (running_elevated)
     return;
 
-  registry->AddInterface(base::Bind(&ExtensionUnpackerImpl::Create));
-  registry->AddInterface(base::Bind(&ManifestParserImpl::Create));
+  registry->AddInterface(base::Bind(&ExtensionUnpackerImpl::Create),
+                         base::ThreadTaskRunnerHandle::Get());
+  registry->AddInterface(base::Bind(&ManifestParserImpl::Create),
+                         base::ThreadTaskRunnerHandle::Get());
 }
 
 }  // namespace utility_handler
 
 }  // namespace extensions