EME: Handle NO_KEY and resume playback after key is added.

content/common/media/media_player_messages_android.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 android media player.
 // Multiply-included message file, hence no include guard.
 
 #include <string>
 #include <vector>
 
@@ skipping 24 matching lines @@
   IPC_STRUCT_TRAITS_MEMBER(audio_sampling_rate)
   IPC_STRUCT_TRAITS_MEMBER(is_audio_encrypted)
   IPC_STRUCT_TRAITS_MEMBER(audio_extra_data)
 
   IPC_STRUCT_TRAITS_MEMBER(video_codec)
   IPC_STRUCT_TRAITS_MEMBER(video_size)
   IPC_STRUCT_TRAITS_MEMBER(is_video_encrypted)
   IPC_STRUCT_TRAITS_MEMBER(video_extra_data)
 
   IPC_STRUCT_TRAITS_MEMBER(duration_ms)
+#if defined(GOOGLE_TV)
   IPC_STRUCT_TRAITS_MEMBER(key_system)
+#endif  // defined(GOOGLE_TV)
 IPC_STRUCT_TRAITS_END()
 
 IPC_STRUCT_TRAITS_BEGIN(media::DemuxerData)
   IPC_STRUCT_TRAITS_MEMBER(type)
   IPC_STRUCT_TRAITS_MEMBER(access_units)
 IPC_STRUCT_TRAITS_END()
 
 IPC_STRUCT_TRAITS_BEGIN(media::AccessUnit)
   IPC_STRUCT_TRAITS_MEMBER(status)
   IPC_STRUCT_TRAITS_MEMBER(end_of_stream)
@@ skipping 11 matching lines @@
 
 IPC_ENUM_TRAITS(media::MediaPlayerAndroid::SourceType)
 
 // Messages for notifying the render process of media playback status -------
 
 // Media buffering has updated.
 IPC_MESSAGE_ROUTED2(MediaPlayerMsg_MediaBufferingUpdate,
                     int /* player_id */,
                     int /* percent */)
 
-// A media playback error has occured.
+// A media playback error has occurred.
 IPC_MESSAGE_ROUTED2(MediaPlayerMsg_MediaError,
                     int /* player_id */,
                     int /* error */)
 
 // Playback is completed.
 IPC_MESSAGE_ROUTED1(MediaPlayerMsg_MediaPlaybackCompleted,
                     int /* player_id */)
 
 // Media metadata has changed.
 IPC_MESSAGE_ROUTED5(MediaPlayerMsg_MediaMetadataChanged,
@@ skipping 47 matching lines @@
 
 // The media source player reads data from demuxer
 IPC_MESSAGE_ROUTED2(MediaPlayerMsg_ReadFromDemuxer,
                     int /* player_id */,
                     media::DemuxerStream::Type /* type */)
 
 // The player needs new config data
 IPC_MESSAGE_ROUTED1(MediaPlayerMsg_MediaConfigRequest,
                     int /* player_id */)
 
-// Messages for controllering the media playback in browser process ----------
+// Messages for controlling the media playback in browser process ----------
 
 // Destroy the media player object.
 IPC_MESSAGE_ROUTED1(MediaPlayerHostMsg_DestroyMediaPlayer,
                     int /* player_id */)
 
 // Destroy all the players.
 IPC_MESSAGE_ROUTED0(MediaPlayerHostMsg_DestroyAllMediaPlayers)
 
 // Initialize a media player object with the given player_id.
 IPC_MESSAGE_ROUTED4(
@@ skipping 87 matching lines @@
                     int /* media_keys_id */,
                     std::string /* session_id */,
                     media::MediaKeys::KeyError /* error_code */,
                     int /* system_code */)
 
 IPC_MESSAGE_ROUTED4(MediaKeysMsg_KeyMessage,
                     int /* media_keys_id */,
                     std::string /* session_id */,
                     std::vector<uint8> /* message */,
                     std::string /* destination_url */)