Get rid of the RenderViewType concept in content, since it was only used by Chrome. Store the enum…

chrome/browser/automation/automation_util.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/automation_util.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 13 matching lines @@
 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog_queue.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/automation_id.h"
 #include "chrome/common/chrome_view_type.h"
 #include "chrome/common/extensions/extension.h"
 #include "content/public/browser/browser_thread.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/web_contents.h"
 #include "net/cookies/cookie_monster.h"
 #include "net/cookies/cookie_store.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 
 using content::BrowserThread;
 using content::RenderViewHost;
 using content::WebContents;
 
@@ skipping 364 matching lines @@
 
 AutomationId GetIdForTab(const TabContentsWrapper* tab) {
   return AutomationId(
       AutomationId::kTypeTab,
       base::IntToString(tab->restore_tab_helper()->session_id().id()));
 }
 
 AutomationId GetIdForExtensionView(
     const content::RenderViewHost* render_view_host) {
   AutomationId::Type type;
-  switch (render_view_host->GetDelegate()->GetRenderViewType()) {
+  WebContents* web_contents = WebContents::FromRenderViewHost(
+      const_cast<RenderViewHost*>(render_view_host));

[Avi (use Gerrit), 2012/05/23 03:22:52]

Eeeewww. Can you please fix FromRenderViewHost to take a const RVH* so you can
drop casts like this? I can't think of why it shouldn't be able to.

[jam, 2012/05/23 04:18:38]

Done.

+  switch (chrome::GetViewType(web_contents)) {
     case chrome::VIEW_TYPE_EXTENSION_POPUP:
       type = AutomationId::kTypeExtensionPopup;
       break;
     case chrome::VIEW_TYPE_EXTENSION_BACKGROUND_PAGE:
       type = AutomationId::kTypeExtensionBgPage;
       break;
     case chrome::VIEW_TYPE_EXTENSION_INFOBAR:
       type = AutomationId::kTypeExtensionInfobar;
       break;
     default:
@@ skipping 123 matching lines @@
       const extensions::Extension* extension;
       return GetExtensionForId(id, profile, &extension);
     }
     default:
       break;
   }
   return false;
 }
 
 }  // namespace automation_util