Remove redundant DevToolsManager methods and clean up its clients.

content/browser/devtools/devtools_http_handler_impl.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 "content/browser/devtools/devtools_http_handler_impl.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 586 matching lines @@
     return;
   }
 
   std::string page_id = request.path.substr(strlen(kPageUrlPrefix));
   DevToolsAgentHost* agent = binding_->ForIdentifier(page_id);
   if (!agent) {
     Send500(connection_id, "No such target id: " + page_id);
     return;
   }
 
-  DevToolsManager* manager = DevToolsManager::GetInstance();
-  if (manager->GetDevToolsClientHostFor(agent)) {
+  if (agent->IsAttached()) {
     Send500(connection_id,
             "Target with given id is being inspected: " + page_id);
     return;
   }
 
   DevToolsClientHostImpl* client_host =
       new DevToolsClientHostImpl(thread_->message_loop(),
                                  server_,
                                  connection_id);
   connection_to_client_host_ui_[connection_id] = client_host;
 
-  manager->RegisterDevToolsClientHostFor(agent, client_host);
+  DevToolsManager::GetInstance()->
+      RegisterDevToolsClientHostFor(agent, client_host);
 
   AcceptWebSocket(connection_id, request);
 }
 
 void DevToolsHttpHandlerImpl::OnWebSocketMessageUI(
     int connection_id,
     const std::string& data) {
   if (browser_target_ && connection_id == browser_target_->connection_id()) {
     std::string json_response = browser_target_->HandleMessage(data);
 
@@ skipping 176 matching lines @@
     NavigationController& controller = web_contents->GetController();
     NavigationEntry* entry = controller.GetActiveEntry();
     if (entry != NULL && entry->GetURL().is_valid()) {
       dictionary->SetString(kTargetFaviconUrlField,
           entry->GetFavicon().url.spec());
     }
   }
   dictionary->SetString(kTargetDescriptionField,
       delegate_->GetViewDescription(rvh));
 
-  if (!DevToolsManager::GetInstance()->GetDevToolsClientHostFor(agent))
+  if (!agent->IsAttached())
     SerializeDebuggerURLs(dictionary, id, host);
   return dictionary;
 }
 
 base::DictionaryValue* DevToolsHttpHandlerImpl::SerializeWorkerInfo(
     const WorkerService::WorkerInfo& worker,
     const std::string& host) {
   base::DictionaryValue* dictionary = new base::DictionaryValue;
 
   scoped_refptr<DevToolsAgentHost> agent(DevToolsAgentHost::GetForWorker(
       worker.process_id, worker.route_id));
 
   std::string id = binding_->GetIdentifier(agent);
 
   dictionary->SetString(kTargetIdField, id);
   dictionary->SetString(kTargetTypeField, kTargetTypeOther);
   dictionary->SetString(kTargetTitleField,
       UTF16ToUTF8(net::EscapeForHTML(worker.name)));
   dictionary->SetString(kTargetUrlField, worker.url.spec());
   dictionary->SetString(kTargetDescriptionField,
       base::StringPrintf("Worker pid:%d", base::GetProcId(worker.handle)));
 
-  if (!DevToolsManager::GetInstance()->GetDevToolsClientHostFor(agent))
+  if (!agent->IsAttached())
     SerializeDebuggerURLs(dictionary, id, host);
   return dictionary;
 }
 
 void DevToolsHttpHandlerImpl::SerializeDebuggerURLs(
     base::DictionaryValue* dictionary,
     const std::string& id,
     const std::string& host) {
   dictionary->SetString(kTargetWebSocketDebuggerUrlField,
                         base::StringPrintf("ws://%s%s%s",
                                            host.c_str(),
                                            kPageUrlPrefix,
                                            id.c_str()));
   std::string devtools_frontend_url = GetFrontendURLInternal(
       id.c_str(),
       host);
   dictionary->SetString(kTargetDevtoolsFrontendUrlField, devtools_frontend_url);
 }
 
 }  // namespace content