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

chrome/browser/ui/cocoa/extensions/extension_action_context_menu_controller_browsertest.mm

 // Copyright 2013 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.
 
 #import "chrome/browser/ui/cocoa/extensions/extension_action_context_menu_controller.h"
 
 #include "base/files/file_path.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/path_service.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/extensions/browser_action_test_util.h"
 #include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/extensions/extension_action_manager.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/cocoa/browser_window_cocoa.h"
 #include "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
 #include "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/pref_names.h"
-#include "content/public/browser/devtools_agent_host.h"
+#include "content/public/browser/devtools_manager.h"
 #include "content/public/test/test_utils.h"
 #include "extensions/common/extension.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 
 using extensions::Extension;
 
 namespace {
 
 NSMenuItem* GetInspectItem(NSMenu* menu) {
@@ skipping 104 matching lines @@
 
 namespace {
 
 class DevToolsAttachedObserver {
  public:
   DevToolsAttachedObserver(const base::Closure& callback)
       : callback_(callback),
         devtools_callback_(base::Bind(
             &DevToolsAttachedObserver::OnDevToolsStateChanged,
             base::Unretained(this))) {
-    content::DevToolsAgentHost::AddAgentStateCallback(devtools_callback_);
+    content::DevToolsManager::GetInstance()->AddAgentStateCallback(
+        devtools_callback_);
   }
 
   ~DevToolsAttachedObserver() {
-    content::DevToolsAgentHost::RemoveAgentStateCallback(devtools_callback_);
+    content::DevToolsManager::GetInstance()->RemoveAgentStateCallback(
+        devtools_callback_);
   }
 
   void OnDevToolsStateChanged(content::DevToolsAgentHost*, bool attached) {
     if (attached)
       callback_.Run();
   }
 
  private:
   base::Closure callback_;
   base::Callback<void(content::DevToolsAgentHost*, bool)> devtools_callback_;
@@ skipping 25 matching lines @@
   scoped_refptr<content::MessageLoopRunner> loop_runner(
       new content::MessageLoopRunner);
   DevToolsAttachedObserver observer(loop_runner->QuitClosure());
   [NSApp sendAction:[inspectItem action]
                  to:[inspectItem target]
                from:inspectItem];
   loop_runner->Run();
 
   service->SetBoolean(prefs::kExtensionsUIDeveloperMode, original);
 }