Browser-wide audio mirroring for TabCapture API

content/browser/renderer_host/media/web_contents_capture_util.cc

Index: content/browser/renderer_host/media/web_contents_capture_util.cc
diff --git a/content/browser/renderer_host/media/web_contents_capture_util.cc b/content/browser/renderer_host/media/web_contents_capture_util.cc
index ed36cb2f80d887e81f1065b6c246c5c8ce86b9c5..0161b3113cb236822b6500463f52f9e2b02ddf17 100644
--- a/content/browser/renderer_host/media/web_contents_capture_util.cc
+++ b/content/browser/renderer_host/media/web_contents_capture_util.cc
@@ -4,15 +4,43 @@
 
 #include "content/browser/renderer_host/media/web_contents_capture_util.h"
 
+#include "base/basictypes.h"
 #include "base/string_number_conversions.h"
 #include "base/string_piece.h"
+#include "base/string_util.h"
+
+namespace {
+
+const char kVirtualDeviceScheme[] = "virtual://";
+
+}  // namespace
 
 namespace content {
 
+std::string WebContentsCaptureUtil::AppendWebContentsDeviceScheme(
+    const std::string& device_id) {
+  return kVirtualDeviceScheme + device_id;
+}
+
+std::string WebContentsCaptureUtil::StripWebContentsDeviceScheme(
+    const std::string& device_id) {
+  return device_id.substr(

[miu, 2012/11/22 00:53:50]

Don't need 2nd arg to substr().  Also, consider instead:

  return (IsWebContentsDeviceId(device_id) ?
              device_id.substr(arraysize(kVirtualDeviceScheme) - 1) :
              device_id);

Typical behavior of "strip" string functions is to strip if a match is made, and
make no changes if no match.

[justinlin, 2012/11/26 20:19:20]

Done.

+      arraysize(kVirtualDeviceScheme) - 1, device_id.length());
+}
+
+bool WebContentsCaptureUtil::IsWebContentsDeviceId(
+    const std::string& device_id) {
+  return StartsWithASCII(device_id, kVirtualDeviceScheme, true);
+}
+
 bool WebContentsCaptureUtil::ExtractTabCaptureTarget(
-    const std::string& device_id,
+    const std::string& device_id_param,
     int* render_process_id,
     int* render_view_id) {
+  DCHECK(IsWebContentsDeviceId(device_id_param));
+  const std::string device_id = device_id_param.substr(
+      arraysize(kVirtualDeviceScheme) - 1, device_id_param.length());

[miu, 2012/11/22 00:53:50]

Don't need 2nd arg to substr().

[justinlin, 2012/11/26 20:19:20]

Done.

+
   const size_t sep_pos = device_id.find(':');
   if (sep_pos == std::string::npos)
     return false;