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

Side by Side Diff: webkit/renderer/media/crypto/key_systems_unittest.cc

Issue 17101027: Add a function to convert key system into UUID (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: nits Created 7 years, 6 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 #include <vector> 6 #include <vector>
7 7
8 #include "testing/gtest/include/gtest/gtest.h" 8 #include "testing/gtest/include/gtest/gtest.h"
9 #include "third_party/WebKit/public/platform/WebString.h" 9 #include "third_party/WebKit/public/platform/WebString.h"
10 #include "webkit/renderer/media/crypto/key_systems.h" 10 #include "webkit/renderer/media/crypto/key_systems.h"
(...skipping 735 matching lines...) Expand 10 before | Expand all | Expand 10 after
746 EXPECT_FALSE(IsSupportedKeySystemWithMediaMimeType( 746 EXPECT_FALSE(IsSupportedKeySystemWithMediaMimeType(
747 "audio/mp4", avc1_codec(), kWidevineAlpha)); 747 "audio/mp4", avc1_codec(), kWidevineAlpha));
748 EXPECT_FALSE(IsSupportedKeySystemWithMediaMimeType( 748 EXPECT_FALSE(IsSupportedKeySystemWithMediaMimeType(
749 "audio/mp4", avc1_and_aac_codecs(), kWidevineAlpha)); 749 "audio/mp4", avc1_and_aac_codecs(), kWidevineAlpha));
750 750
751 // Non-MP4 codec. 751 // Non-MP4 codec.
752 EXPECT_FALSE(IsSupportedKeySystemWithMediaMimeType( 752 EXPECT_FALSE(IsSupportedKeySystemWithMediaMimeType(
753 "audio/mp4", vorbis_codec(), kWidevineAlpha)); 753 "audio/mp4", vorbis_codec(), kWidevineAlpha));
754 } 754 }
755 755
756 #if defined(OS_ANDROID)
757 TEST_F(KeySystemsTest, ConvertKeySystemToUUID) {
758 std::vector<uint8> uuid = GetUUID(kWidevineAlpha);
759 EXPECT_EQ(16u, uuid.size());
ddorwin 2013/06/20 22:20:15 Do you care about the actual uuid? It seems we sho
qinmin 2013/06/20 23:30:12 Done.
760
ddorwin 2013/06/20 22:20:15 You could break out unsupported systmes into a sep
qinmin 2013/06/20 23:30:12 Done.
761 uuid = GetUUID(kWidevine);
ddorwin 2013/06/20 22:20:15 These could all be collapsed into a single line. F
qinmin 2013/06/20 23:30:12 Changed to EXPECT_TRUE(GetUUID(kWidevine).empty())
762 EXPECT_EQ(0u, uuid.size());
763 uuid = GetUUID(kClearKey);
764 EXPECT_EQ(0u, uuid.size());
765 uuid = GetUUID("");
766 EXPECT_EQ(0u, uuid.size());
767 }
768 #endif // defined(OS_ANDROID)
769
756 } // namespace webkit_media 770 } // namespace webkit_media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698