Reland 125805 - Reland 124817 - A profile-keyed service for Extensions, ExtensionSystem.

chrome/browser/extensions/extension_devtools_bridge.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/extension_devtools_bridge.h"
 
 #include "base/json/json_writer.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_devtools_events.h"
 #include "chrome/browser/extensions/extension_devtools_manager.h"
 #include "chrome/browser/extensions/extension_event_router.h"
+#include "chrome/browser/extensions/extension_system.h"
+#include "chrome/browser/extensions/extension_system_factory.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "content/public/browser/devtools_agent_host_registry.h"
 #include "content/public/browser/devtools_manager.h"
 #include "content/public/browser/web_contents.h"
 
 using content::DevToolsAgentHost;
 using content::DevToolsAgentHostRegistry;
 using content::DevToolsManager;
 using content::WebContents;
 
 ExtensionDevToolsBridge::ExtensionDevToolsBridge(int tab_id,
                                                  Profile* profile)
     : tab_id_(tab_id),
       profile_(profile),
       on_page_event_name_(
           ExtensionDevToolsEvents::OnPageEventNameForTab(tab_id)),
       on_tab_close_event_name_(
           ExtensionDevToolsEvents::OnTabCloseEventNameForTab(tab_id)) {
-  extension_devtools_manager_ = profile_->GetExtensionDevToolsManager();
+  extension_devtools_manager_ =
+      ExtensionSystemFactory::GetForProfile(profile)->devtools_manager();
   DCHECK(extension_devtools_manager_.get());
 }
 
 ExtensionDevToolsBridge::~ExtensionDevToolsBridge() {
 }
 
 static std::string FormatDevToolsMessage(int id, const std::string& method) {
   DictionaryValue message;
   message.SetInteger("id", id);
   message.SetString("method", method);
@@ skipping 71 matching lines @@
 
   std::string json = base::StringPrintf("[%s]", data.c_str());
   profile_->GetExtensionEventRouter()->DispatchEventToRenderers(
       on_page_event_name_, json, profile_, GURL());
 }
 
 void ExtensionDevToolsBridge::TabReplaced(WebContents* new_tab) {
   // We don't update the tab id as it needs to remain the same so that we can
   // properly unregister.
 }