Reland review 34393006: Refactor MediaStreamManager to not output real device id.

content/browser/renderer_host/media/device_request_message_filter_unittest.cc

 // Copyright 2013 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 "base/strings/string_number_conversions.h"
 #include "content/browser/renderer_host/media/device_request_message_filter.h"
 #include "content/browser/renderer_host/media/media_stream_manager.h"
 #include "content/common/media/media_stream_messages.h"
-#include "content/public/browser/media_device_id.h"
 #include "content/public/test/mock_resource_context.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::_;
 using ::testing::Invoke;
 
 namespace content {
 
@@ skipping 91 matching lines @@
     // After the video device callback is fired, |message| should be populated.
     EXPECT_CALL(*media_stream_manager_, CancelRequest(kAudioLabel))
         .Times(1);
     EXPECT_CALL(*media_stream_manager_, CancelRequest(kVideoLabel))
         .Times(1);
     FireVideoDeviceCallback();
     EXPECT_EQ(static_cast<size_t>(number_audio_devices + number_video_devices),
               host_->requested_devices().size());
 
     EXPECT_EQ(kRequestId, host_->received_id());
-    // Check to make sure no devices have raw ids.
-    EXPECT_FALSE(DoesContainRawIds(host_->requested_devices()));
-
-    // Check to make sure every GUID produced matches a raw device id.
-    EXPECT_TRUE(DoesEveryDeviceMapToRawId(host_->requested_devices(), origin));
   }
 
   bool AreLabelsPresent(MediaStreamType type) {
     const StreamDeviceInfoArray& devices = host_->requested_devices();
     for (size_t i = 0; i < devices.size(); i++) {
       if (devices[i].device.type == type && !devices[i].device.name.empty())
         return true;
     }
     return false;
   }
@@ skipping 56 matching lines @@
   }
 
   void FireAudioDeviceCallback() {
     host_->DevicesEnumerated(kAudioLabel, physical_audio_devices_);
   }
 
   void FireVideoDeviceCallback() {
     host_->DevicesEnumerated(kVideoLabel, physical_video_devices_);
   }
 
-  bool DoesContainRawIds(const StreamDeviceInfoArray& devices) {
-    for (size_t i = 0; i < devices.size(); i++) {
-      for (size_t j = 0; j < physical_audio_devices_.size(); ++j) {
-        if (physical_audio_devices_[j].device.id == devices[i].device.id)
-          return true;
-      }
-      for (size_t j = 0; j < physical_video_devices_.size(); ++j) {
-        if (physical_video_devices_[j].device.id == devices[i].device.id)
-          return true;
-      }
-    }
-    return false;
-  }
-
-  bool DoesEveryDeviceMapToRawId(const StreamDeviceInfoArray& devices,
-                                 const GURL& origin) {
-    for (size_t i = 0; i < devices.size(); i++) {
-      bool found_match = false;
-      for (size_t j = 0; j < physical_audio_devices_.size(); ++j) {
-        if (content::DoesMediaDeviceIDMatchHMAC(
-                origin,
-                devices[i].device.id,
-                physical_audio_devices_[j].device.id)) {
-          EXPECT_FALSE(found_match);
-          found_match = true;
-        }
-      }
-      for (size_t j = 0; j < physical_video_devices_.size(); ++j) {
-        if (content::DoesMediaDeviceIDMatchHMAC(
-                origin,
-                devices[i].device.id,
-                physical_video_devices_[j].device.id)) {
-          EXPECT_FALSE(found_match);
-          found_match = true;
-        }
-      }
-      if (!found_match)
-        return false;
-    }
-    return true;
-  }
-
   int next_device_id_;
 };
 
 TEST_F(DeviceRequestMessageFilterTest, TestGetSources_AudioAndVideoDevices) {
   // Runs through test with 1 audio and 1 video device.
   RunTest(1, 1);
 }
 
 TEST_F(DeviceRequestMessageFilterTest,
        TestGetSources_MultipleAudioAndVideoDevices) {
@@ skipping 42 matching lines @@
 
 TEST_F(DeviceRequestMessageFilterTest, TestGetSources_AllowMicAllowCamera) {
   resource_context_->set_mic_access(true);
   resource_context_->set_camera_access(true);
   RunTest(3, 3);
   EXPECT_TRUE(AreLabelsPresent(MEDIA_DEVICE_AUDIO_CAPTURE));
   EXPECT_TRUE(AreLabelsPresent(MEDIA_DEVICE_VIDEO_CAPTURE));
 }
 
 };  // namespace content