Add histogram WebRTC.UserMediaRequest.NoResultState to track user media requests with no result.

content/renderer/media/media_stream_impl.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 "content/renderer/media/media_stream_impl.h"
 
 #include <utility>
 
 #include "base/hash.h"
 #include "base/logging.h"
@@ skipping 181 matching lines @@
 }
 
 void MediaStreamImpl::cancelUserMediaRequest(
     const blink::WebUserMediaRequest& user_media_request) {
   DCHECK(CalledOnValidThread());
   UserMediaRequestInfo* request = FindUserMediaRequestInfo(user_media_request);
   if (request) {
     // We can't abort the stream generation process.
     // Instead, erase the request. Once the stream is generated we will stop the
     // stream if the request does not exist.
+    LogUserMediaRequestWithNoResult(MEDIA_STREAM_REQUEST_EXPLICITLY_CANCELLED);
     DeleteUserMediaRequestInfo(request);
   }
 }
 
 void MediaStreamImpl::requestMediaDevices(
     const blink::WebMediaDevicesRequest& media_devices_request) {
   UpdateWebRTCMethodCount(WEBKIT_GET_MEDIA_DEVICES);
   DCHECK(CalledOnValidThread());
 
   int audio_input_request_id = g_next_request_id++;
@@ skipping 54 matching lines @@
 void MediaStreamImpl::OnStreamGenerated(
     int request_id,
     const std::string& label,
     const StreamDeviceInfoArray& audio_array,
     const StreamDeviceInfoArray& video_array) {
   DCHECK(CalledOnValidThread());
   DVLOG(1) << "MediaStreamImpl::OnStreamGenerated stream:" << label;
 
   UserMediaRequestInfo* request_info = FindUserMediaRequestInfo(request_id);
   if (!request_info) {
-    // This can happen if the request is canceled or the frame reloads while
-    // MediaStreamDispatcher is processing the request.
-    // Only stop the device if the device is not used in another MediaStream.
-    for (StreamDeviceInfoArray::const_iterator device_it = audio_array.begin();
-         device_it != audio_array.end(); ++device_it) {
-      if (!FindLocalSource(*device_it))
-        media_stream_dispatcher_->StopStreamDevice(*device_it);
-    }
-
-    for (StreamDeviceInfoArray::const_iterator device_it = video_array.begin();
-         device_it != video_array.end(); ++device_it) {
-      if (!FindLocalSource(*device_it))
-        media_stream_dispatcher_->StopStreamDevice(*device_it);
-    }
-
     DVLOG(1) << "Request ID not found";
+    OnStreamGeneratedForCancelledRequest(audio_array, video_array);
     return;
   }
   request_info->generated = true;
 
   // WebUserMediaRequest don't have an implementation in unit tests.
   // Therefore we need to check for isNull here and initialize the
   // constraints.
   blink::WebUserMediaRequest* request = &(request_info->request);
   blink::WebMediaConstraints audio_constraints;
   blink::WebMediaConstraints video_constraints;
@@ skipping 23 matching lines @@
   web_stream->setExtraData(
       new MediaStream(
           *web_stream));
 
   // Wait for the tracks to be started successfully or to fail.
   request_info->CallbackOnTracksStarted(
       base::Bind(&MediaStreamImpl::OnCreateNativeTracksCompleted,
                  weak_factory_.GetWeakPtr()));
 }
 
+// This can happen if the request is canceled or the frame reloads while
+// MediaStreamDispatcher is processing the request.
+// Only stop the device if the device is not used in another MediaStream.

[tommi (sloooow) - chröme, 2014/08/06 11:42:21]

nit: documentation for methods tends to stay in the header

[andresp-chromium, 2014/08/06 11:59:14]

Split documentation to the relevant places.

+void MediaStreamImpl::OnStreamGeneratedForCancelledRequest(
+    const StreamDeviceInfoArray& audio_array,
+    const StreamDeviceInfoArray& video_array) {
+  for (StreamDeviceInfoArray::const_iterator device_it = audio_array.begin();
+       device_it != audio_array.end(); ++device_it) {
+    if (!FindLocalSource(*device_it))
+      media_stream_dispatcher_->StopStreamDevice(*device_it);
+  }
+
+  for (StreamDeviceInfoArray::const_iterator device_it = video_array.begin();
+       device_it != video_array.end(); ++device_it) {
+    if (!FindLocalSource(*device_it))
+      media_stream_dispatcher_->StopStreamDevice(*device_it);
+  }
+}
+
 // Callback from MediaStreamDispatcher.
 // The requested stream failed to be generated.
 void MediaStreamImpl::OnStreamGenerationFailed(
     int request_id,
     content::MediaStreamRequestResult result) {
   DCHECK(CalledOnValidThread());
   DVLOG(1) << "MediaStreamImpl::OnStreamGenerationFailed("
            << request_id << ")";
   UserMediaRequestInfo* request_info = FindUserMediaRequestInfo(request_id);
   if (!request_info) {
@@ skipping 349 matching lines @@
   UserMediaRequests::iterator it = user_media_requests_.begin();
   for (; it != user_media_requests_.end(); ++it) {
     if ((*it) == request) {
       user_media_requests_.erase(it);
       return;
     }
   }
   NOTREACHED();
 }
 
+void MediaStreamImpl::DeleteAllUserMediaRequests() {
+  UserMediaRequests::iterator request_it = user_media_requests_.begin();
+  while (request_it != user_media_requests_.end()) {
+    DVLOG(1) << "MediaStreamImpl@" << this << "::DeleteAllUserMediaRequests: "
+             << "Cancel user media request " << (*request_it)->request_id;
+    // If the request is not generated, it means that a request
+    // has been sent to the MediaStreamDispatcher to generate a stream
+    // but MediaStreamDispatcher has not yet responded and we need to cancel
+    // the request.
+    if (!(*request_it)->generated) {
+      media_stream_dispatcher_->CancelGenerateStream(
+          (*request_it)->request_id, weak_factory_.GetWeakPtr());
+    }
+    if ((*request_it)->generated) {

[tommi (sloooow) - chröme, 2014/08/06 11:42:21]

should this be an else?

[andresp-chromium, 2014/08/06 11:59:14]

Done.

+      DCHECK((*request_it)->HasPendingSources());
+      LogUserMediaRequestWithNoResult(
+          MEDIA_STREAM_REQUEST_PENDING_MEDIA_TRACKS);
+    } else {
+      DCHECK(!(*request_it)->HasPendingSources());

[tommi (sloooow) - chröme, 2014/08/06 11:42:21]

...and this looks like it should be in the scope where we call
CancelGenerateStream() (unless I'm missing something)

[andresp-chromium, 2014/08/06 11:59:14]

Done. Yeah you are right! Since I was looking as two diffs (one refactor  + one
adding logging) I never noticed I had the same condition above. Collapsing them
together now.

+      LogUserMediaRequestWithNoResult(MEDIA_STREAM_REQUEST_NOT_GENERATED);
+    }
+    request_it = user_media_requests_.erase(request_it);
+  }
+}
+
 MediaStreamImpl::MediaDevicesRequestInfo*
 MediaStreamImpl::FindMediaDevicesRequestInfo(
     int request_id) {
   MediaDevicesRequests::iterator it = media_devices_requests_.begin();
   for (; it != media_devices_requests_.end(); ++it) {
     if ((*it)->audio_input_request_id == request_id ||
         (*it)->video_input_request_id == request_id ||
         (*it)->audio_output_request_id == request_id) {
       return (*it);
     }
@@ skipping 27 matching lines @@
 
       media_devices_requests_.erase(it);
       return;
     }
   }
   NOTREACHED();
 }
 
 void MediaStreamImpl::FrameWillClose() {
   // Cancel all outstanding UserMediaRequests.
-  UserMediaRequests::iterator request_it = user_media_requests_.begin();
-  while (request_it != user_media_requests_.end()) {
-    DVLOG(1) << "MediaStreamImpl@" << this << "::FrameWillClose: "
-             << "Cancel user media request " << (*request_it)->request_id;
-    // If the request is not generated, it means that a request
-    // has been sent to the MediaStreamDispatcher to generate a stream
-    // but MediaStreamDispatcher has not yet responded and we need to cancel
-    // the request.
-    if (!(*request_it)->generated) {
-      media_stream_dispatcher_->CancelGenerateStream(
-          (*request_it)->request_id, weak_factory_.GetWeakPtr());
-    }
-    request_it = user_media_requests_.erase(request_it);
-  }
+  DeleteAllUserMediaRequests();
 
   // Loop through all current local sources and stop the sources.
   LocalStreamSources::iterator sources_it = local_sources_.begin();
   while (sources_it != local_sources_.end()) {
     StopLocalSource(*sources_it, true);
     sources_it = local_sources_.erase(sources_it);
   }
 }
 
 void MediaStreamImpl::OnLocalSourceStopped(
@@ skipping 128 matching lines @@
   for (std::vector<blink::WebMediaStreamSource>::iterator it =
            sources_.begin();
        it != sources_.end(); ++it) {
     if (source.id() == it->id()) {
       sources_.erase(it);
       return;
     }
   }
 }
 
+bool MediaStreamImpl::UserMediaRequestInfo::AreAllSourcesRemoved() const {

[tommi (sloooow) - chröme, 2014/08/06 11:42:21]

ugh, grammar :-/  not sure we should fix that now though

[andresp-chromium, 2014/08/06 11:59:14]

This method is never called. Removing.

+  return sources_.empty();
+}
+
+bool MediaStreamImpl::UserMediaRequestInfo::HasPendingSources() const {
+  return !sources_waiting_for_callback_.empty();
+}
 }  // namespace content