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

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

Issue 684613002: Standardize usage of virtual/override/final specifiers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/memory/scoped_ptr.h" 6 #include "base/memory/scoped_ptr.h"
7 #include "base/path_service.h" 7 #include "base/path_service.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "base/win/windows_version.h" 9 #include "base/win/windows_version.h"
10 #include "chrome/browser/media/media_browsertest.h" 10 #include "chrome/browser/media/media_browsertest.h"
(...skipping 320 matching lines...) Expand 10 before | Expand all | Expand 10 after
331 SetUpCommandLineForKeySystem(kExternalClearKeyKeySystem, command_line); 331 SetUpCommandLineForKeySystem(kExternalClearKeyKeySystem, command_line);
332 } 332 }
333 }; 333 };
334 334
335 // Tests encrypted media playback using ExternalClearKey key system in 335 // Tests encrypted media playback using ExternalClearKey key system in
336 // decrypt-and-decode mode for unprefixed EME. 336 // decrypt-and-decode mode for unprefixed EME.
337 // TODO(jrummell): Merge with ECKEncryptedMediaTest once unprefixed is 337 // TODO(jrummell): Merge with ECKEncryptedMediaTest once unprefixed is
338 // enabled by default. 338 // enabled by default.
339 class ECKUnprefixedEncryptedMediaTest : public EncryptedMediaTestBase { 339 class ECKUnprefixedEncryptedMediaTest : public EncryptedMediaTestBase {
340 protected: 340 protected:
341 virtual void SetUpCommandLine(CommandLine* command_line) override { 341 void SetUpCommandLine(CommandLine* command_line) override {
342 EncryptedMediaTestBase::SetUpCommandLine(command_line); 342 EncryptedMediaTestBase::SetUpCommandLine(command_line);
343 command_line->AppendSwitch(switches::kEnableEncryptedMedia); 343 command_line->AppendSwitch(switches::kEnableEncryptedMedia);
344 SetUpCommandLineForKeySystem(kExternalClearKeyKeySystem, command_line); 344 SetUpCommandLineForKeySystem(kExternalClearKeyKeySystem, command_line);
345 } 345 }
346 }; 346 };
347 347
348 #if defined(WIDEVINE_CDM_AVAILABLE) 348 #if defined(WIDEVINE_CDM_AVAILABLE)
349 // Tests encrypted media playback using Widevine key system. 349 // Tests encrypted media playback using Widevine key system.
350 class WVEncryptedMediaTest : public EncryptedMediaTestBase { 350 class WVEncryptedMediaTest : public EncryptedMediaTestBase {
351 protected: 351 protected:
(...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after
698 "bear-320x240-v_enc-v.webm", 698 "bear-320x240-v_enc-v.webm",
699 kWebMVideoOnly, 699 kWebMVideoOnly,
700 kExternalClearKeyKeySystem, 700 kExternalClearKeyKeySystem,
701 SRC, 701 SRC,
702 UNPREFIXED, 702 UNPREFIXED,
703 kUnknownSession, 703 kUnknownSession,
704 false, 704 false,
705 kEmeKeyError); 705 kEmeKeyError);
706 } 706 }
707 #endif // defined(ENABLE_PEPPER_CDMS) 707 #endif // defined(ENABLE_PEPPER_CDMS)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698