[DevTools] Migrate from AgentStateCallbacks to DevToolsAgentHostObserver.

extensions/browser/app_window/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 "extensions/browser/app_window/app_window_registry.h"
 
 #include <string>
 #include <vector>
 
 #include "base/strings/stringprintf.h"
@@ skipping 27 matching lines @@
                                                    bool was_shown) {
 }
 
 void AppWindowRegistry::Observer::OnAppWindowActivated(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_);
+    : context_(context) {
+  content::DevToolsAgentHost::AddObserver(this);
 }
 
 AppWindowRegistry::~AppWindowRegistry() {
-  content::DevToolsAgentHost::RemoveAgentStateCallback(devtools_callback_);
+  content::DevToolsAgentHost::RemoveObserver(this);
 }
 
 // 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 107 matching lines @@
   }
   return result;
 }
 
 bool AppWindowRegistry::HadDevToolsAttached(
     content::WebContents* web_contents) const {
   std::string key = GetWindowKeyForWebContents(web_contents);
   return key.empty() ? false : inspected_windows_.count(key) != 0;
 }
 
-void AppWindowRegistry::OnDevToolsStateChanged(
-    content::DevToolsAgentHost* agent_host,
-    bool attached) {
-  content::WebContents* web_contents = agent_host->GetWebContents();
-  // Ignore unrelated notifications.
-  if (!web_contents || web_contents->GetBrowserContext() != context_)
-    return;
+void AppWindowRegistry::DevToolsAgentHostAttached(
+    content::DevToolsAgentHost* agent_host) {
+  std::string key = GetWindowKeyForAgentHost(agent_host);
+  if (!key.empty())
+    inspected_windows_.insert(key);
+}
 
-  std::string key = GetWindowKeyForWebContents(web_contents);
-  if (key.empty())
-    return;
-
-  if (attached)
-    inspected_windows_.insert(key);
-  else
+void AppWindowRegistry::DevToolsAgentHostDetached(
+    content::DevToolsAgentHost* agent_host) {
+  std::string key = GetWindowKeyForAgentHost(agent_host);
+  if (!key.empty())
     inspected_windows_.erase(key);
 }
 
 void AppWindowRegistry::AddAppWindowToList(AppWindow* app_window) {
   const AppWindowList::iterator it =
       std::find(app_windows_.begin(), app_windows_.end(), app_window);
   if (it != app_windows_.end())
     return;
   app_windows_.push_back(app_window);
 }
 
 void AppWindowRegistry::BringToFront(AppWindow* app_window) {
   const AppWindowList::iterator it =
       std::find(app_windows_.begin(), app_windows_.end(), app_window);
   if (it != app_windows_.end())
     app_windows_.erase(it);
   app_windows_.push_front(app_window);
 }
 
+std::string AppWindowRegistry::GetWindowKeyForAgentHost(
+    content::DevToolsAgentHost* agent_host) const {
+  content::WebContents* web_contents = agent_host->GetWebContents();
+  if (!web_contents || web_contents->GetBrowserContext() != context_)
+    return std::string();
+  return GetWindowKeyForWebContents(web_contents);
+}
+
 std::string AppWindowRegistry::GetWindowKeyForWebContents(
     content::WebContents* web_contents) const {
   AppWindow* app_window = GetAppWindowForWebContents(web_contents);
   if (!app_window)
     return std::string();  // Not an AppWindow.
 
   if (app_window->window_key().empty())
     return web_contents->GetURL().possibly_invalid_spec();
 
   return base::StringPrintf("%s:%s", app_window->extension_id().c_str(),
@@ skipping 34 matching lines @@
 bool AppWindowRegistry::Factory::ServiceIsNULLWhileTesting() const {
   return false;
 }
 
 content::BrowserContext* AppWindowRegistry::Factory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
   return ExtensionsBrowserClient::Get()->GetOriginalContext(context);
 }
 
 }  // namespace extensions