Revert "DevTools: remove obsolete methods from DevToolsClientHost"

chrome/browser/debugger/devtools_window.cc

 // Copyright (c) 2011 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 <algorithm>
 
 #include "base/command_line.h"
 #include "base/json/json_writer.h"
-#include "base/lazy_instance.h"
 #include "base/stringprintf.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/debugger/devtools_file_util.h"
 #include "chrome/browser/debugger/devtools_window.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
@@ skipping 18 matching lines @@
 #include "content/browser/tab_contents/navigation_controller.h"
 #include "content/browser/tab_contents/navigation_entry.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/tab_contents/tab_contents_view.h"
 #include "content/common/devtools_messages.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/common/bindings_policy.h"
 #include "grit/generated_resources.h"
 
-typedef std::vector<DevToolsWindow*> DevToolsWindowList;
-namespace {
-base::LazyInstance<DevToolsWindowList,
-                   base::LeakyLazyInstanceTraits<DevToolsWindowList> >
-     g_instances = LAZY_INSTANCE_INITIALIZER;
-}  // namespace
-
 const char DevToolsWindow::kDevToolsApp[] = "DevToolsApp";
 
 // static
 void DevToolsWindow::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterBooleanPref(prefs::kDevToolsOpenDocked,
                              true,
                              PrefService::UNSYNCABLE_PREF);
 }
 
 // static
 TabContentsWrapper* DevToolsWindow::GetDevToolsContents(
     TabContents* inspected_tab) {
   if (!inspected_tab)
     return NULL;
 
   DevToolsManager* manager = DevToolsManager::GetInstance();
+  if (!manager)
+    return NULL;  // Happens only in tests.
+
   DevToolsClientHost* client_host = manager->
       GetDevToolsClientHostFor(inspected_tab->render_view_host());
   DevToolsWindow* window = AsDevToolsWindow(client_host);
   if (!window || !window->is_docked())
     return NULL;
   return window->tab_contents();
 }
 
 // static
+DevToolsWindow* DevToolsWindow::FindDevToolsWindow(
+    RenderViewHost* window_rvh) {
+  DevToolsClientHost* client_host =
+      DevToolsClientHost::FindOwnerClientHost(window_rvh);
+  return client_host != NULL ? DevToolsWindow::AsDevToolsWindow(client_host)
+                             : NULL;
+}
+
+// static
 DevToolsWindow* DevToolsWindow::OpenDevToolsWindowForWorker(
     Profile* profile,
     DevToolsAgentHost* worker_agent) {
   DevToolsWindow* window;
   DevToolsClientHost* client =
       DevToolsManager::GetInstance()->GetDevToolsClientHostFor(worker_agent);
   if (client) {
     window = AsDevToolsWindow(client);
     if (!window)
       return NULL;
@@ skipping 62 matching lines @@
                                RenderViewHost* inspected_rvh,
                                bool docked)
     : RenderViewHostObserver(tab_contents->render_view_host()),
       profile_(profile),
       inspected_tab_(NULL),
       tab_contents_(tab_contents),
       browser_(NULL),
       docked_(docked),
       is_loaded_(false),
       action_on_load_(DEVTOOLS_TOGGLE_ACTION_NONE) {
-  g_instances.Get().push_back(this);
   // Wipe out page icon so that the default application icon is used.
   NavigationEntry* entry = tab_contents_->controller().GetActiveEntry();
   entry->favicon().set_bitmap(SkBitmap());
   entry->favicon().set_is_valid(true);
 
   // Register on-load actions.
   registrar_.Add(
       this,
       content::NOTIFICATION_LOAD_STOP,
       content::Source<NavigationController>(&tab_contents_->controller()));
   registrar_.Add(
       this,
       content::NOTIFICATION_TAB_CLOSING,
       content::Source<NavigationController>(&tab_contents_->controller()));
   registrar_.Add(
       this,
       chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
       content::Source<ThemeService>(
           ThemeServiceFactory::GetForProfile(profile_)));
   // There is no inspected_rvh in case of shared workers.
   if (inspected_rvh) {
     TabContents* tab = inspected_rvh->delegate()->GetAsTabContents();
     if (tab)
       inspected_tab_ = TabContentsWrapper::GetCurrentWrapperForContents(tab);
   }
 }
 
 DevToolsWindow::~DevToolsWindow() {
-  DevToolsWindowList& instances = g_instances.Get();
-  DevToolsWindowList::iterator it = std::find(instances.begin(),
-                                              instances.end(),
-                                              this);
-  DCHECK(it != instances.end());
-  instances.erase(it);
 }
 
 void DevToolsWindow::SendMessageToClient(const IPC::Message& message) {
   RenderViewHost* target_host = tab_contents_->render_view_host();
   IPC::Message* m =  new IPC::Message(message);
   m->set_routing_id(target_host->routing_id());
   target_host->Send(m);
 }
 
 void DevToolsWindow::InspectedTabClosing() {
@@ skipping 20 matching lines @@
 void DevToolsWindow::TabReplaced(TabContents* new_tab) {
   TabContentsWrapper* new_tab_wrapper =
       TabContentsWrapper::GetCurrentWrapperForContents(new_tab);
   DCHECK(new_tab_wrapper);
   if (!new_tab_wrapper)
       return;
   DCHECK_EQ(profile_, new_tab_wrapper->profile());
   inspected_tab_ = new_tab_wrapper;
 }
 
+RenderViewHost* DevToolsWindow::GetClientRenderViewHost() {
+  return tab_contents_->render_view_host();
+}
+
 void DevToolsWindow::Show(DevToolsToggleAction action) {
   if (docked_) {
     Browser* inspected_browser;
     int inspected_tab_index;
     // Tell inspected browser to update splitter and switch to inspected panel.
     if (!IsInspectedBrowserPopupOrPanel() &&
         FindInspectedBrowserAndTabIndex(&inspected_browser,
                                         &inspected_tab_index)) {
       BrowserWindow* inspected_window = inspected_browser->window();
       tab_contents_->tab_contents()->set_delegate(this);
@@ skipping 391 matching lines @@
     window->Show(action);
   else
     manager->UnregisterDevToolsClientHostFor(inspected_rvh);
 
   return window;
 }
 
 // static
 DevToolsWindow* DevToolsWindow::AsDevToolsWindow(
     DevToolsClientHost* client_host) {
-  if (!client_host || g_instances == NULL)
+  if (!client_host)
     return NULL;
-  DevToolsWindowList& instances = g_instances.Get();
-  for (DevToolsWindowList::iterator it = instances.begin();
-       it != instances.end(); ++it) {
-    DevToolsClientHost* client = *it;
-    if (client == client_host)
-      return *it;
-  }
+  if (client_host->GetClientRenderViewHost() != NULL)
+    return static_cast<DevToolsWindow*>(client_host);
   return NULL;
 }
 
 void DevToolsWindow::RenderViewHostDestroyed(RenderViewHost* rvh) {
   // Don't delete |this| here, do it on NOTIFICATION_TAB_CLOSING event.
 }
 
 bool DevToolsWindow::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(DevToolsWindow, message)
@@ skipping 19 matching lines @@
   RequestSetDocked(false);
 }
 
 content::JavaScriptDialogCreator* DevToolsWindow::GetJavaScriptDialogCreator() {
   if (inspected_tab_ && inspected_tab_->tab_contents()->delegate()) {
     return inspected_tab_->tab_contents()->delegate()->
         GetJavaScriptDialogCreator();
   }
   return TabContentsDelegate::GetJavaScriptDialogCreator();
 }