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

Side by Side Diff: chrome/browser/media/encrypted_media_supported_types_browsertest.cc

Issue 2957983002: Remove pointless InProcessBrowserTest calls. (Closed)
Patch Set: build Created 3 years, 5 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
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 <stddef.h> 5 #include <stddef.h>
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/base_switches.h" 10 #include "base/base_switches.h"
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 invalid_codecs_.push_back("hvc1"); 152 invalid_codecs_.push_back("hvc1");
153 invalid_codecs_.push_back("hvc1."); 153 invalid_codecs_.push_back("hvc1.");
154 154
155 // Non-zero VP9 profiles are supported in WebM and MP4 with ClearKey. 155 // Non-zero VP9 profiles are supported in WebM and MP4 with ClearKey.
156 // Widevine support will eventually be added. See http://crbug.com/707128 156 // Widevine support will eventually be added. See http://crbug.com/707128
157 clear_key_exclusive_video_common_codecs_.push_back("vp09.01.10.08"); 157 clear_key_exclusive_video_common_codecs_.push_back("vp09.01.10.08");
158 clear_key_exclusive_video_common_codecs_.push_back("vp09.02.10.10"); 158 clear_key_exclusive_video_common_codecs_.push_back("vp09.02.10.10");
159 clear_key_exclusive_video_common_codecs_.push_back("vp09.03.10.10"); 159 clear_key_exclusive_video_common_codecs_.push_back("vp09.03.10.10");
160 } 160 }
161 161
162 void SetUpCommandLine(base::CommandLine* command_line) override {
163 InProcessBrowserTest::SetUpCommandLine(command_line);
164 }
165
166 typedef std::vector<std::string> CodecVector; 162 typedef std::vector<std::string> CodecVector;
167 163
168 const CodecVector& no_codecs() const { return no_codecs_; } 164 const CodecVector& no_codecs() const { return no_codecs_; }
169 const CodecVector& video_common_codecs() const { 165 const CodecVector& video_common_codecs() const {
170 return video_common_codecs_; 166 return video_common_codecs_;
171 } 167 }
172 const CodecVector& audio_webm_codecs() const { return audio_webm_codecs_; } 168 const CodecVector& audio_webm_codecs() const { return audio_webm_codecs_; }
173 const CodecVector& video_webm_codecs() const { return video_webm_codecs_; } 169 const CodecVector& video_webm_codecs() const { return video_webm_codecs_; }
174 const CodecVector& audio_mp4_codecs() const { return audio_mp4_codecs_; } 170 const CodecVector& audio_mp4_codecs() const { return audio_mp4_codecs_; }
175 const CodecVector& video_mp4_codecs() const { return video_mp4_codecs_; } 171 const CodecVector& video_mp4_codecs() const { return video_mp4_codecs_; }
(...skipping 646 matching lines...) Expand 10 before | Expand all | Expand 10 after
822 kVideoWebMMimeType, video_webm_codecs(), kWidevine)); 818 kVideoWebMMimeType, video_webm_codecs(), kWidevine));
823 819
824 // Clear Key should still be registered. 820 // Clear Key should still be registered.
825 EXPECT_SUCCESS(AreCodecsSupportedByKeySystem(kVideoWebMMimeType, 821 EXPECT_SUCCESS(AreCodecsSupportedByKeySystem(kVideoWebMMimeType,
826 video_webm_codecs(), kClearKey)); 822 video_webm_codecs(), kClearKey));
827 } 823 }
828 #endif // !defined(WIDEVINE_CDM_AVAILABLE) 824 #endif // !defined(WIDEVINE_CDM_AVAILABLE)
829 #endif // BUILDFLAG(ENABLE_PEPPER_CDMS) 825 #endif // BUILDFLAG(ENABLE_PEPPER_CDMS)
830 826
831 } // namespace chrome 827 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698