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

content/common/media/media_stream_messages.h

 // 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.
 
 // IPC messages for the media streaming.
 // Multiply-included message file, hence no include guard.
 
 #include <string>
 
 #include "content/common/content_export.h"
 #include "content/common/media/media_stream_options.h"
 #include "ipc/ipc_message_macros.h"
 
 #undef IPC_MESSAGE_EXPORT
 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT
 #define IPC_MESSAGE_START MediaStreamMsgStart
 
 IPC_ENUM_TRAITS(media_stream::MediaStreamType)
-IPC_ENUM_TRAITS(media_stream::StreamOptions::VideoOption)
 
 IPC_STRUCT_TRAITS_BEGIN(media_stream::StreamOptions)
   IPC_STRUCT_TRAITS_MEMBER(audio)
-  IPC_STRUCT_TRAITS_MEMBER(video_option)
+  IPC_STRUCT_TRAITS_MEMBER(video)
 IPC_STRUCT_TRAITS_END()
 
 IPC_STRUCT_TRAITS_BEGIN(media_stream::StreamDeviceInfo)
   IPC_STRUCT_TRAITS_MEMBER(stream_type)
   IPC_STRUCT_TRAITS_MEMBER(name)
   IPC_STRUCT_TRAITS_MEMBER(device_id)
   IPC_STRUCT_TRAITS_MEMBER(in_use)
   IPC_STRUCT_TRAITS_MEMBER(session_id)
 IPC_STRUCT_TRAITS_END()
 
@@ skipping 62 matching lines @@
                      media_stream::MediaStreamType /* type */,
                      std::string /* security origin */)
 
 // Request to open the device.
 IPC_MESSAGE_CONTROL5(MediaStreamHostMsg_OpenDevice,
                      int /* render view id */,
                      int /* request id */,
                      std::string /* device_id */,
                      media_stream::MediaStreamType /* type */,
                      std::string /* security origin */)