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

content/browser/renderer_host/media/media_stream_ui_proxy_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 "content/browser/renderer_host/media/media_stream_ui_proxy.h"
 
 #include "base/message_loop/message_loop.h"
 #include "content/browser/renderer_host/render_view_host_delegate.h"
 #include "content/public/common/renderer_preferences.h"
 #include "content/public/test/test_browser_thread.h"
@@ skipping 74 matching lines @@
     expected.tab_capture_device_id == arg.tab_capture_device_id &&
     expected.security_origin == arg.security_origin &&
     expected.request_type == arg.request_type &&
     expected.requested_audio_device_id == arg.requested_audio_device_id &&
     expected.requested_video_device_id == arg.requested_video_device_id &&
     expected.audio_type == arg.audio_type &&
     expected.video_type == arg.video_type;
 }
 
 TEST_F(MediaStreamUIProxyTest, Deny) {
-  MediaStreamRequest request(0, 0, 0, std::string(), GURL("http://origin/"),
+  MediaStreamRequest request(0, 0, 0, GURL("http://origin/"),
                              MEDIA_GENERATE_STREAM, std::string(),
                              std::string(),
                              MEDIA_DEVICE_AUDIO_CAPTURE,
                              MEDIA_DEVICE_VIDEO_CAPTURE);
   proxy_->RequestAccess(
       request, base::Bind(&MockResponseCallback::OnAccessRequestResponse,
                           base::Unretained(&response_callback_)));
   MediaResponseCallback callback;
   EXPECT_CALL(delegate_, RequestMediaAccessPermission(SameRequest(request), _))
     .WillOnce(SaveArg<1>(&callback));
   message_loop_.RunUntilIdle();
   ASSERT_FALSE(callback.is_null());
 
   MediaStreamDevices devices;
   callback.Run(devices, scoped_ptr<MediaStreamUI>());
 
   MediaStreamDevices response;
   EXPECT_CALL(response_callback_, OnAccessRequestResponse(_))
     .WillOnce(SaveArg<0>(&response));
   message_loop_.RunUntilIdle();
 
   EXPECT_TRUE(response.empty());
 }
 
 TEST_F(MediaStreamUIProxyTest, AcceptAndStart) {
-  MediaStreamRequest request(0, 0, 0, std::string(), GURL("http://origin/"),
+  MediaStreamRequest request(0, 0, 0, GURL("http://origin/"),
                              MEDIA_GENERATE_STREAM, std::string(),
                              std::string(),
                              MEDIA_DEVICE_AUDIO_CAPTURE,
                              MEDIA_DEVICE_VIDEO_CAPTURE);
   proxy_->RequestAccess(
       request, base::Bind(&MockResponseCallback::OnAccessRequestResponse,
                           base::Unretained(&response_callback_)));
   MediaResponseCallback callback;
   EXPECT_CALL(delegate_, RequestMediaAccessPermission(SameRequest(request), _))
     .WillOnce(SaveArg<1>(&callback));
@@ skipping 13 matching lines @@
   message_loop_.RunUntilIdle();
 
   EXPECT_FALSE(response.empty());
 
   proxy_->OnStarted(base::Closure());
   message_loop_.RunUntilIdle();
 }
 
 // Verify that the proxy can be deleted before the request is processed.
 TEST_F(MediaStreamUIProxyTest, DeleteBeforeAccepted) {
-  MediaStreamRequest request(0, 0, 0, std::string(), GURL("http://origin/"),
+  MediaStreamRequest request(0, 0, 0, GURL("http://origin/"),
                              MEDIA_GENERATE_STREAM, std::string(),
                              std::string(),
                              MEDIA_DEVICE_AUDIO_CAPTURE,
                              MEDIA_DEVICE_VIDEO_CAPTURE);
   proxy_->RequestAccess(
       request, base::Bind(&MockResponseCallback::OnAccessRequestResponse,
                           base::Unretained(&response_callback_)));
   MediaResponseCallback callback;
   EXPECT_CALL(delegate_, RequestMediaAccessPermission(SameRequest(request), _))
     .WillOnce(SaveArg<1>(&callback));
   message_loop_.RunUntilIdle();
   ASSERT_FALSE(callback.is_null());
 
   proxy_.reset();
 
   MediaStreamDevices devices;
   scoped_ptr<MediaStreamUI> ui;
   callback.Run(devices, ui.Pass());
 }
 
 TEST_F(MediaStreamUIProxyTest, StopFromUI) {
-  MediaStreamRequest request(0, 0, 0, std::string(), GURL("http://origin/"),
+  MediaStreamRequest request(0, 0, 0, GURL("http://origin/"),
                              MEDIA_GENERATE_STREAM, std::string(),
                              std::string(),
                              MEDIA_DEVICE_AUDIO_CAPTURE,
                              MEDIA_DEVICE_VIDEO_CAPTURE);
   proxy_->RequestAccess(
       request, base::Bind(&MockResponseCallback::OnAccessRequestResponse,
                           base::Unretained(&response_callback_)));
   MediaResponseCallback callback;
   EXPECT_CALL(delegate_, RequestMediaAccessPermission(SameRequest(request), _))
     .WillOnce(SaveArg<1>(&callback));
@@ skipping 22 matching lines @@
                                base::Unretained(&stop_handler)));
   message_loop_.RunUntilIdle();
 
   ASSERT_FALSE(stop_callback.is_null());
   EXPECT_CALL(stop_handler, OnStop());
   stop_callback.Run();
   message_loop_.RunUntilIdle();
 }
 
 }  // content