Revert of [DevTools] Make DevTools clients talk directly to DevToolsAgentHost instead of using DevToolsManage…

apps/app_window_registry.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 "apps/app_window_registry.h"
 
 #include <string>
 #include <vector>
 
 #include "apps/app_window.h"
 #include "apps/ui/apps_client.h"
 #include "apps/ui/native_app_window.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/devtools_agent_host.h"
+#include "content/public/browser/devtools_manager.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/extensions_browser_client.h"
 #include "extensions/common/extension.h"
 
 namespace {
 
 // Create a key that identifies a AppWindow in a RenderViewHost across App
@@ skipping 38 matching lines @@
 void AppWindowRegistry::Observer::OnAppWindowShown(AppWindow* app_window) {
 }
 
 AppWindowRegistry::Observer::~Observer() {
 }
 
 AppWindowRegistry::AppWindowRegistry(content::BrowserContext* context)
     : context_(context),
       devtools_callback_(base::Bind(&AppWindowRegistry::OnDevToolsStateChanged,
                                     base::Unretained(this))) {
-  content::DevToolsAgentHost::AddAgentStateCallback(devtools_callback_);
+  content::DevToolsManager::GetInstance()->AddAgentStateCallback(
+      devtools_callback_);
 }
 
 AppWindowRegistry::~AppWindowRegistry() {
-  content::DevToolsAgentHost::RemoveAgentStateCallback(devtools_callback_);
+  content::DevToolsManager::GetInstance()->RemoveAgentStateCallback(
+      devtools_callback_);
 }
 
 // static
 AppWindowRegistry* AppWindowRegistry::Get(content::BrowserContext* context) {
   return Factory::GetForBrowserContext(context, true /* create */);
 }
 
 void AppWindowRegistry::AddAppWindow(AppWindow* app_window) {
   BringToFront(app_window);
   FOR_EACH_OBSERVER(Observer, observers_, OnAppWindowAdded(app_window));
@@ skipping 255 matching lines @@
   return false;
 }
 
 content::BrowserContext* AppWindowRegistry::Factory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
   return extensions::ExtensionsBrowserClient::Get()->GetOriginalContext(
       context);
 }
 
 }  // namespace apps