Shift media_stream::StreamOptions to align with the new getUserMedia spec

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 72 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(MockMediaStreamDispatcherEventHandler);
 };
 
 }  // namespace
 
 TEST(MediaStreamDispatcherTest, BasicStream) {
   scoped_ptr<MediaStreamDispatcher> dispatcher(new MediaStreamDispatcher(NULL));
   scoped_ptr<MockMediaStreamDispatcherEventHandler>
       handler(new MockMediaStreamDispatcherEventHandler);
   media_stream::StreamOptions components(

[scherkus (not reviewing), 2012/04/27 17:52:40]

nit: this can fit on one line

-      true, media_stream::StreamOptions::kFacingUser);
+      true, true);
   std::string security_origin;
 
   int ipc_request_id1 = dispatcher->next_ipc_id_;
   dispatcher->GenerateStream(kRequestId1, handler.get()->AsWeakPtr(),
                              components, security_origin);
   int ipc_request_id2 = dispatcher->next_ipc_id_;
   EXPECT_NE(ipc_request_id1, ipc_request_id2);
   dispatcher->GenerateStream(kRequestId2, handler.get()->AsWeakPtr(),
                              components, security_origin);
   EXPECT_EQ(dispatcher->requests_.size(), size_t(2));
@@ skipping 141 matching lines @@
 
   // Verify that the request have been completed.
   EXPECT_EQ(dispatcher->label_stream_map_.size(), size_t(0));
   EXPECT_EQ(dispatcher->requests_.size(), size_t(0));
 }
 
 TEST(MediaStreamDispatcherTest, TestFailure) {
   scoped_ptr<MediaStreamDispatcher> dispatcher(new MediaStreamDispatcher(NULL));
   scoped_ptr<MockMediaStreamDispatcherEventHandler>
       handler(new MockMediaStreamDispatcherEventHandler);
   media_stream::StreamOptions components(

[scherkus (not reviewing), 2012/04/27 17:52:40]

nit: this can fit on one line

-      true, media_stream::StreamOptions::kFacingUser);
+      true, true);
   std::string security_origin;
 
   // Test failure when creating a stream.
   int ipc_request_id1 = dispatcher->next_ipc_id_;
   dispatcher->GenerateStream(kRequestId1, handler.get()->AsWeakPtr(),
                              components, security_origin);
   dispatcher->OnMessageReceived(MediaStreamMsg_StreamGenerationFailed(
       kRouteId, ipc_request_id1));
 
   // Verify that the request have been completed.
@@ skipping 40 matching lines @@
 
   // Test failure of the audio device.
   dispatcher->OnMessageReceived(
       MediaStreamHostMsg_AudioDeviceFailed(kRouteId, stream_label1, 0));
   EXPECT_EQ(handler->audio_failed, true);
 
   // Stop stream1.
   dispatcher->StopStream(stream_label1);
   EXPECT_EQ(dispatcher->label_stream_map_.size(), size_t(0));
 }