Get rid of the last RenderViewHostDelegate usage in chrome.

chrome/browser/media/media_stream_capture_indicator.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/media/media_stream_capture_indicator.h"
 
 #include "base/bind.h"
 #include "base/i18n/rtl.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/status_icons/status_icon.h"
 #include "chrome/browser/status_icons/status_tray.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.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 "content/public/browser/web_contents_delegate.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "net/base/net_util.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 using content::BrowserThread;
 using content::WebContents;
 
@@ skipping 32 matching lines @@
     int command_id, ui::Accelerator* accelerator) {
   // No accelerators for status icon context menu.
   return false;
 }
 
 void MediaStreamCaptureIndicator::ExecuteCommand(int command_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(command_id >= IDC_MEDIA_CONTEXT_MEDIA_STREAM_CAPTURE_LIST_FIRST &&
          command_id <= IDC_MEDIA_CONTEXT_MEDIA_STREAM_CAPTURE_LIST_LAST);
   int index = command_id - IDC_MEDIA_CONTEXT_MEDIA_STREAM_CAPTURE_LIST_FIRST;
-  WebContents* tab_content = tab_util::GetWebContentsByID(
+  WebContents* web_content = tab_util::GetWebContentsByID(
       tabs_[index].render_process_id, tabs_[index].render_view_id);
-  DCHECK(tab_content);
-  if (!tab_content || !tab_content->GetRenderViewHost() ||
-      !tab_content->GetRenderViewHost()->GetDelegate()) {
+  DCHECK(web_content);
+  if (!web_content) {
     NOTREACHED();
     return;
   }
 
-  tab_content->GetRenderViewHost()->GetDelegate()->Activate();
+  web_content->GetDelegate()->ActivateContents(web_content);
 }
 
 void MediaStreamCaptureIndicator::CaptureDevicesOpened(
     int render_process_id,
     int render_view_id,
     const content::MediaStreamDevices& devices) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DCHECK(!devices.empty());
 
   BrowserThread::PostTask(
@@ skipping 269 matching lines @@
 
   // Remove the last character if it is a '/'.
   if (!security_origin.empty()) {
     std::string::iterator it = security_origin.end() - 1;
     if (*it == '/')
       security_origin.erase(it);
   }
 
   return UTF8ToUTF16(security_origin);
 }