Minor cleanups in MediaStreamCaptureIndicator.

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/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 256 matching lines @@
 void MediaStreamCaptureIndicator::CaptureDevicesOpened(
     int render_process_id,
     int render_view_id,
     const content::MediaStreamDevices& devices,
     const base::Closure& close_callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DCHECK(!devices.empty());
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
-      base::Bind(&MediaStreamCaptureIndicator::DoDevicesOpenedOnUIThread,
+      base::Bind(&MediaStreamCaptureIndicator::AddCaptureDevices,
                  this, render_process_id, render_view_id, devices,
                  close_callback));
 }
 
 void MediaStreamCaptureIndicator::CaptureDevicesClosed(
     int render_process_id,
     int render_view_id,
     const content::MediaStreamDevices& devices) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DCHECK(!devices.empty());
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
-      base::Bind(&MediaStreamCaptureIndicator::DoDevicesClosedOnUIThread,
+      base::Bind(&MediaStreamCaptureIndicator::RemoveCaptureDevices,
                  this, render_process_id, render_view_id, devices));
 }
 
 
 bool MediaStreamCaptureIndicator::IsCapturingUserMedia(
-    int render_process_id, int render_view_id) const {
+    content::WebContents* web_contents) const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  WebContents* const web_contents =
-      LookUpByKnownAlias(render_process_id, render_view_id);
-  if (!web_contents)
-    return false;
-
   UsageMap::const_iterator it = usage_map_.find(web_contents);
   return (it != usage_map_.end() &&
           (it->second->IsCapturingAudio() || it->second->IsCapturingVideo()));
 }
 
 bool MediaStreamCaptureIndicator::IsBeingMirrored(
-    int render_process_id, int render_view_id) const {
+    content::WebContents* web_contents) const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  WebContents* const web_contents =
-      LookUpByKnownAlias(render_process_id, render_view_id);
-  if (!web_contents)
-    return false;
-
   UsageMap::const_iterator it = usage_map_.find(web_contents);
   return it != usage_map_.end() && it->second->IsMirroring();
 }
 
-void MediaStreamCaptureIndicator::DoDevicesOpenedOnUIThread(
-    int render_process_id,
-    int render_view_id,
-    const content::MediaStreamDevices& devices,
-    const base::Closure& close_callback) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-
-  AddCaptureDevices(render_process_id, render_view_id, devices, close_callback);
-}
-
-void MediaStreamCaptureIndicator::DoDevicesClosedOnUIThread(
-    int render_process_id,
-    int render_view_id,
-    const content::MediaStreamDevices& devices) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-
-  RemoveCaptureDevices(render_process_id, render_view_id, devices);
-}
-
 void MediaStreamCaptureIndicator::MaybeCreateStatusTrayIcon() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (status_icon_)
     return;
 
   // If there is no browser process, we should not create the status tray.
   if (!g_browser_process)
     return;
 
   StatusTray* status_tray = g_browser_process->status_tray();
@@ skipping 265 matching lines @@
   }
 
   UpdateNotificationUserInterface();
 }
 
 void MediaStreamCaptureIndicator::OnStopScreenCapture(
     const base::Closure& stop) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   stop.Run();
 }