Remove the deprecated function ExtensionService::extensions().

chrome/browser/extensions/api/messaging/message_service.cc

 // Copyright (c) 2012 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/browser/extensions/api/messaging/message_service.h"
 
 #include "base/atomic_sequence_num.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/json/json_writer.h"
@@ skipping 13 matching lines @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/extension_host.h"
+#include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/extensions_browser_client.h"
 #include "extensions/browser/lazy_background_task_queue.h"
 #include "extensions/browser/pref_names.h"
 #include "extensions/browser/process_manager.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest_constants.h"
 #include "extensions/common/manifest_handlers/background_info.h"
 #include "extensions/common/manifest_handlers/externally_connectable.h"
 #include "extensions/common/manifest_handlers/incognito_info.h"
@@ skipping 193 matching lines @@
     const std::string& target_extension_id,
     const GURL& source_url,
     const std::string& channel_name,
     bool include_tls_channel_id) {
   content::RenderProcessHost* source =
       content::RenderProcessHost::FromID(source_process_id);
   if (!source)
     return;
   BrowserContext* context = source->GetBrowserContext();
 
-  ExtensionSystem* extension_system = ExtensionSystem::Get(context);
-  DCHECK(extension_system);
-  const Extension* target_extension = extension_system->extension_service()->
-      extensions()->GetByID(target_extension_id);
+  ExtensionRegistry* registry = ExtensionRegistry::Get(context);
+  const Extension* target_extension = registry->GetExtensionById(

[not at google - send to devlin, 2014/11/11 20:20:08]

Ditto.

[Reilly Grant (use Gerrit), 2014/11/11 20:55:31]

Done.

+      target_extension_id, ExtensionRegistry::ENABLED);
   if (!target_extension) {
     DispatchOnDisconnect(
         source, receiver_port_id, kReceivingEndDoesntExistError);
     return;
   }
 
   bool is_web_connection = false;
 
   if (source_extension_id != target_extension_id) {
     // It's an external connection. Check the externally_connectable manifest
@@ skipping 457 matching lines @@
   PendingTlsChannelIdMap::iterator pending_for_tls_channel_id =
       pending_tls_channel_id_channels_.find(channel_id);
   if (pending_for_tls_channel_id == pending_tls_channel_id_channels_.end()) {
     NOTREACHED();
     return;
   }
 
   BrowserContext* context = params->source->GetBrowserContext();
 
   const Extension* target_extension =
-      ExtensionSystem::Get(context)->extension_service()->extensions()->GetByID(
-          params->target_extension_id);
+      ExtensionRegistry::Get(context)->GetExtensionById(

[not at google - send to devlin, 2014/11/11 20:20:08]

Ditto.

[Reilly Grant (use Gerrit), 2014/11/11 20:55:31]

Done.

+          params->target_extension_id, ExtensionRegistry::ENABLED);
   if (!target_extension) {
     pending_tls_channel_id_channels_.erase(channel_id);
     DispatchOnDisconnect(
         params->source, params->receiver_port_id,
         kReceivingEndDoesntExistError);
     return;
   }
   PendingMessagesQueue& pending_messages = pending_for_tls_channel_id->second;
   if (MaybeAddPendingLazyBackgroundPageOpenChannelTask(
           context, target_extension, params.get())) {
@@ skipping 43 matching lines @@
 }
 
 void MessageService::DispatchOnDisconnect(content::RenderProcessHost* source,
                                           int port_id,
                                           const std::string& error_message) {
   ExtensionMessagePort port(source, MSG_ROUTING_CONTROL, "");
   port.DispatchOnDisconnect(GET_OPPOSITE_PORT_ID(port_id), error_message);
 }
 
 }  // namespace extensions