Fix bug causing tab favicon media indicator to not turn off.

chrome/browser/ui/tabs/tab_utils.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/ui/tabs/tab_utils.h"
 
 #include "chrome/browser/media/media_internals.h"
 #include "chrome/browser/media/media_stream_capture_indicator.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 
 namespace chrome {
 
 bool ShouldShowProjectingIndicator(content::WebContents* contents) {
   int render_process_id = contents->GetRenderProcessHost()->GetID();
   int render_view_id = contents->GetRenderViewHost()->GetRoutingID();
   scoped_refptr<MediaStreamCaptureIndicator> capture_indicator =
       MediaInternals::GetInstance()->GetMediaStreamCaptureIndicator();
-  return capture_indicator->IsProcessCapturingTab(render_process_id,
+  return capture_indicator->IsRenderViewMirroring(render_process_id,

[justinlin, 2013/01/23 19:30:43]

Hmm, not sure about this naming change. Isn't it actually whether the render
process is capturing that we care about?

[miu, 2013/01/23 20:33:28]

Done.  I thought a bit more about the naming here.  Originally, these two
methods were named almost the same way; but the problem I had is that they
indicate two different things.  The two methods can be described as:

1. Returns true if the render view is capturing user media (e.g., webcam).
2. Returns true if the render view itself is being mirrored.

In case #1, the render view is a *consumer* of some external media source.  So,
I went with naming this method IsCapturingUserMedia(rp_id, rv_id).

In case #2, the render view is itself a *source* of media (A/V is being
generated from it).  So, the method name should help communicate that flow of
media is in the opposite direction.  I renamed the method to
IsSupplyingMirroredMedia(rp_id, rv_id).

Do these names sound good to you?

BTW--Also did a little tweak here to make things fit nicer within 80-char lines.
 ;-)

                                                   render_view_id);
 }
 
 bool ShouldShowRecordingIndicator(content::WebContents* contents) {
   int render_process_id = contents->GetRenderProcessHost()->GetID();
   int render_view_id = contents->GetRenderViewHost()->GetRoutingID();
   scoped_refptr<MediaStreamCaptureIndicator> capture_indicator =
       MediaInternals::GetInstance()->GetMediaStreamCaptureIndicator();
   // The projecting indicator takes precedence over the recording indicator, but
   // if we are projecting and we don't handle the projecting case we want to
   // still show the recording indicator.
-  return capture_indicator->IsProcessCapturing(render_process_id,
-                                               render_view_id) ||
-         capture_indicator->IsProcessCapturingTab(render_process_id,
+  return capture_indicator->IsRenderViewCapturing(render_process_id,
+                                                  render_view_id) ||
+         capture_indicator->IsRenderViewMirroring(render_process_id,
                                                   render_view_id);
 }
 
 }  // namespace chrome