Support cancellation of request for opening device.

content/renderer/media/media_stream_dispatcher_unittest.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 <string>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "content/common/media/media_stream_messages.h"
@@ skipping 362 matching lines @@
       handler(new MockMediaStreamDispatcherEventHandler);
   StreamOptions components(kAudioType, kVideoType);
   int ipc_request_id1 = dispatcher->next_ipc_id_;
 
   dispatcher->GenerateStream(kRequestId1, handler.get()->AsWeakPtr(),
                              components, GURL());
   dispatcher->GenerateStream(kRequestId2, handler.get()->AsWeakPtr(),
                              components, GURL());
 
   EXPECT_EQ(2u, dispatcher->requests_.size());
-  dispatcher->CancelGenerateStream(kRequestId2);
+  dispatcher->CancelGenerateStream(kRequestId2, handler.get()->AsWeakPtr());
   EXPECT_EQ(1u, dispatcher->requests_.size());
 
   // Complete the creation of stream1.
   StreamDeviceInfo audio_device_info;
   audio_device_info.device.name = "Microphone";
   audio_device_info.device.type = kAudioType;
   audio_device_info.session_id = kAudioSessionId;
   StreamDeviceInfoArray audio_device_array(1);
   audio_device_array[0] = audio_device_info;
 
   StreamDeviceInfo video_device_info;
   video_device_info.device.name = "Camera";
   video_device_info.device.type = kVideoType;
   video_device_info.session_id = kVideoSessionId;
   StreamDeviceInfoArray video_device_array(1);
   video_device_array[0] = video_device_info;
 
   std::string stream_label1 = "stream1";
   dispatcher->OnMessageReceived(MediaStreamMsg_StreamGenerated(
       kRouteId, ipc_request_id1, stream_label1,
       audio_device_array, video_device_array));
   EXPECT_EQ(handler->request_id_, kRequestId1);
   EXPECT_EQ(handler->label_, stream_label1);
   EXPECT_EQ(0u, dispatcher->requests_.size());
 }
 
 }  // namespace content