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

chrome/utility/extensions/extensions_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 "chrome/utility/extensions/extensions_handler.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "chrome/common/extensions/chrome_extensions_client.h"
 #include "chrome/common/extensions/chrome_utility_extensions_messages.h"
 #include "chrome/common/extensions/media_parser.mojom.h"
 #include "chrome/common/extensions/removable_storage_writer.mojom.h"
 #include "chrome/common/media_galleries/metadata_types.h"
 #include "chrome/utility/image_writer/image_writer_handler.h"
 #include "chrome/utility/media_galleries/ipc_data_source.h"
 #include "chrome/utility/media_galleries/media_metadata_parser.h"
 #include "content/public/utility/utility_thread.h"
 #include "media/base/media.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 "ui/base/ui_base_switches.h"
 
 #if !defined(MEDIA_DISABLE_FFMPEG)
 #include "media/base/media_file_checker.h"
 #endif
 
 #if defined(OS_WIN)
 #include "chrome/common/extensions/wifi_credentials_getter.mojom.h"
 #include "chrome/utility/media_galleries/itunes_pref_parser_win.h"
 #include "components/wifi/wifi_service.h"
@@ skipping 137 matching lines @@
 
 ExtensionsHandler::~ExtensionsHandler() = default;
 
 // static
 void ExtensionsHandler::PreSandboxStartup() {
   media::InitializeMediaLibrary();  // Used for media file validation.
 }
 
 // static
 void ExtensionsHandler::ExposeInterfacesToBrowser(
-    service_manager::InterfaceRegistry* registry,
+    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) {
 #if defined(OS_WIN)
-    registry->AddInterface(base::Bind(&RemovableStorageWriterImpl::Create));
-    registry->AddInterface(base::Bind(&WiFiCredentialsGetterImpl::Create));
+    registry->AddInterface(base::Bind(&RemovableStorageWriterImpl::Create),
+                           base::ThreadTaskRunnerHandle::Get());
+    registry->AddInterface(base::Bind(&WiFiCredentialsGetterImpl::Create),
+                           base::ThreadTaskRunnerHandle::Get());
 #endif
     return;
   }
 
-  registry->AddInterface(base::Bind(&MediaParserImpl::Create));
+  registry->AddInterface(base::Bind(&MediaParserImpl::Create),
+                         base::ThreadTaskRunnerHandle::Get());
 #if !defined(OS_WIN)
-  registry->AddInterface(base::Bind(&RemovableStorageWriterImpl::Create));
+  registry->AddInterface(base::Bind(&RemovableStorageWriterImpl::Create),
+                         base::ThreadTaskRunnerHandle::Get());
 #endif
 }
 
 bool ExtensionsHandler::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(ExtensionsHandler, message)
 #if defined(OS_WIN)
     IPC_MESSAGE_HANDLER(ChromeUtilityMsg_ParseITunesPrefXml,
                         OnParseITunesPrefXml)
 #endif  // defined(OS_WIN)
@@ skipping 67 matching lines @@
   picasa::PicasaAlbumsIndexer indexer(album_uids);
   indexer.ParseFolderINI(folders_inis);
   content::UtilityThread::Get()->Send(
       new ChromeUtilityHostMsg_IndexPicasaAlbumsContents_Finished(
           indexer.albums_images()));
   content::UtilityThread::Get()->ReleaseProcessIfNeeded();
 }
 #endif  // defined(OS_WIN) || defined(OS_MACOSX)
 
 }  // namespace extensions