Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(86)

Side by Side Diff: media/base/android/media_source_player_unittest.cc

Issue 179123009: Encrypted Media: Use uint32 for systemCode in SessionError. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <string> 5 #include <string>
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/strings/stringprintf.h" 9 #include "base/strings/stringprintf.h"
10 #include "media/base/android/media_codec_bridge.h" 10 #include "media/base/android/media_codec_bridge.h"
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 const std::string& web_session_id) OVERRIDE {} 81 const std::string& web_session_id) OVERRIDE {}
82 virtual void OnSessionMessage(int cdm_id, 82 virtual void OnSessionMessage(int cdm_id,
83 uint32 session_id, 83 uint32 session_id,
84 const std::vector<uint8>& message, 84 const std::vector<uint8>& message,
85 const GURL& destination_url) OVERRIDE {} 85 const GURL& destination_url) OVERRIDE {}
86 virtual void OnSessionReady(int cdm_id, uint32 session_id) OVERRIDE {} 86 virtual void OnSessionReady(int cdm_id, uint32 session_id) OVERRIDE {}
87 virtual void OnSessionClosed(int cdm_id, uint32 session_id) OVERRIDE {} 87 virtual void OnSessionClosed(int cdm_id, uint32 session_id) OVERRIDE {}
88 virtual void OnSessionError(int cdm_id, 88 virtual void OnSessionError(int cdm_id,
89 uint32 session_id, 89 uint32 session_id,
90 media::MediaKeys::KeyError error_code, 90 media::MediaKeys::KeyError error_code,
91 int system_code) OVERRIDE {} 91 uint32 system_code) OVERRIDE {}
92 92
93 bool playback_completed() const { 93 bool playback_completed() const {
94 return playback_completed_; 94 return playback_completed_;
95 } 95 }
96 96
97 private: 97 private:
98 base::MessageLoop* message_loop_; 98 base::MessageLoop* message_loop_;
99 bool playback_completed_; 99 bool playback_completed_;
100 100
101 DISALLOW_COPY_AND_ASSIGN(MockMediaPlayerManager); 101 DISALLOW_COPY_AND_ASSIGN(MockMediaPlayerManager);
(...skipping 1991 matching lines...) Expand 10 before | Expand all | Expand 10 after
2093 2093
2094 std::vector<std::string> codec_avc(1, "avc1"); 2094 std::vector<std::string> codec_avc(1, "avc1");
2095 EXPECT_FALSE(IsTypeSupported(invalid_uuid, kL3, kVideoMp4, codec_avc)); 2095 EXPECT_FALSE(IsTypeSupported(invalid_uuid, kL3, kVideoMp4, codec_avc));
2096 EXPECT_FALSE(IsTypeSupported(invalid_uuid, kL1, kVideoMp4, codec_avc)); 2096 EXPECT_FALSE(IsTypeSupported(invalid_uuid, kL1, kVideoMp4, codec_avc));
2097 } 2097 }
2098 2098
2099 // TODO(xhwang): Are these IsTypeSupported tests device specific? 2099 // TODO(xhwang): Are these IsTypeSupported tests device specific?
2100 // TODO(xhwang): Add more IsTypeSupported tests. 2100 // TODO(xhwang): Add more IsTypeSupported tests.
2101 2101
2102 } // namespace media 2102 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698