Remove EPM:all_hosts_ and use all_extension_views_ instead.

chrome/browser/automation/testing_automation_provider.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 "chrome/browser/automation/testing_automation_provider.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 115 matching lines @@
 #include "content/public/browser/browser_child_process_host_iterator.h"
 #include "content/public/browser/child_process_data.h"
 #include "content/public/browser/favicon_status.h"
 #include "content/public/browser/interstitial_page.h"
 #include "content/public/browser/interstitial_page_delegate.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/plugin_service.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
+#include "content/public/browser/render_view_host_delegate.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/child_process_host.h"
 #include "content/public/common/common_param_traits.h"
 #include "content/public/common/ssl_status.h"
 #include "net/cookies/cookie_store.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
 #include "ui/base/events.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/ui_base_types.h"
@@ skipping 2729 matching lines @@
   // Add all extension processes in a list of dictionaries, one dictionary
   // item per extension process.
   ListValue* extension_views = new ListValue;
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   std::vector<Profile*> profiles(profile_manager->GetLoadedProfiles());
   for (size_t i = 0; i < profiles.size(); ++i) {
     ExtensionProcessManager* process_manager =
         profiles[i]->GetExtensionProcessManager();
     if (!process_manager)
       continue;
-    ExtensionProcessManager::const_iterator jt;
-    for (jt = process_manager->begin(); jt != process_manager->end(); ++jt) {
-      ExtensionHost* ex_host = *jt;
+    const ExtensionProcessManager::ViewSet view_set =
+        process_manager->GetAllViews();
+    for (ExtensionProcessManager::ViewSet::const_iterator jt =
+             view_set.begin();
+         jt != view_set.end(); ++jt) {
+      content::RenderViewHost* render_view_host = *jt;
       // Don't add dead extension processes.
-      if (!ex_host->IsRenderViewLive())
+      if (!render_view_host->IsRenderViewLive())
         continue;
+      const Extension* extension =
+          process_manager->GetExtensionForRenderViewHost(render_view_host);
       DictionaryValue* item = new DictionaryValue;
-      item->SetString("name", ex_host->extension()->name());
-      item->SetString("extension_id", ex_host->extension()->id());
+      item->SetString("name", extension->name());
+      item->SetString("extension_id", extension->id());
       item->SetInteger(
           "pid",
-          base::GetProcId(ex_host->render_process_host()->GetHandle()));
+          base::GetProcId(render_view_host->GetProcess()->GetHandle()));
       DictionaryValue* view = new DictionaryValue;
       view->SetInteger(
           "render_process_id",
-          ex_host->render_process_host()->GetID());
+          render_view_host->GetProcess()->GetID());
       view->SetInteger(
           "render_view_id",
-          ex_host->render_view_host()->GetRoutingID());
+          render_view_host->GetRoutingID());
       item->Set("view", view);
       std::string type;
-      switch (ex_host->extension_host_type()) {
+      switch (render_view_host->GetDelegate()->GetRenderViewType()) {
         case chrome::VIEW_TYPE_EXTENSION_BACKGROUND_PAGE:
           type = "EXTENSION_BACKGROUND_PAGE";
           break;
         case chrome::VIEW_TYPE_EXTENSION_POPUP:
           type = "EXTENSION_POPUP";
           break;
         case chrome::VIEW_TYPE_EXTENSION_INFOBAR:
           type = "EXTENSION_INFOBAR";
           break;
         case chrome::VIEW_TYPE_EXTENSION_DIALOG:
           type = "EXTENSION_DIALOG";
           break;
         case chrome::VIEW_TYPE_APP_SHELL:
           type = "APP_SHELL";
           break;
         case chrome::VIEW_TYPE_PANEL:
           type = "PANEL";
           break;
         default:
           type = "unknown";
           break;
       }
       item->SetString("view_type", type);
-      item->SetString("url", ex_host->GetURL().spec());
-      item->SetBoolean("loaded", ex_host->did_stop_loading());
+      item->SetString("url", render_view_host->GetDelegate()->GetURL().spec());
+      item->SetBoolean("loaded", !render_view_host->IsLoading());
       extension_views->Append(item);
     }
   }
   return_value->Set("extension_views", extension_views);
 
   return_value->SetString("child_process_path",
                           ChildProcessHost::GetChildPath(flags).value());
   // Child processes are the processes for plugins and other workers.
   // Add all child processes in a list of dictionaries, one dictionary item
   // per child process.
@@ skipping 3765 matching lines @@
           AutomationId id = automation_util::GetIdForTab(preview_tab);
           dict->Set("auto_id", id.ToValue());
           view_list->Append(dict);
         }
       }
     }
   }
 
   ExtensionProcessManager* extension_mgr =
       profile()->GetExtensionProcessManager();
-  ExtensionProcessManager::const_iterator iter;
-  for (iter = extension_mgr->begin(); iter != extension_mgr->end();
-       ++iter) {
-    ExtensionHost* host = *iter;
+  const ExtensionProcessManager::ViewSet all_views =
+      extension_mgr->GetAllViews();
+  ExtensionProcessManager::ViewSet::const_iterator iter;
+  for (iter = all_views.begin(); iter != all_views.end(); ++iter) {
+    content::RenderViewHost* host = (*iter);
     AutomationId id = automation_util::GetIdForExtensionView(host);
     if (!id.is_valid())
       continue;
+    const Extension* extension =
+        extension_mgr->GetExtensionForRenderViewHost(host);
     DictionaryValue* dict = new DictionaryValue();
     dict->Set("auto_id", id.ToValue());
-    dict->SetString("extension_id", host->extension_id());
+    dict->SetString("extension_id", extension->id());
     view_list->Append(dict);
   }
   DictionaryValue dict;
   dict.Set("views", view_list);
   AutomationJSONReply(this, reply_message).SendSuccess(&dict);
 }
 
 void TestingAutomationProvider::IsTabIdValid(
     DictionaryValue* args, IPC::Message* reply_message) {
   AutomationJSONReply reply(this, reply_message);
@@ skipping 301 matching lines @@
       *browser_handle = browser_tracker_->Add(browser);
       *success = true;
     }
   }
 }
 
 void TestingAutomationProvider::OnRemoveProvider() {
   if (g_browser_process)
     g_browser_process->GetAutomationProviderList()->RemoveProvider(this);
 }