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

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

Issue 831913002: Another official Linux build fix for {virtual,override,final}. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 334 matching lines...) Expand 10 before | Expand all | Expand 10 after
345 EncryptedMediaTestBase::SetUpCommandLine(command_line); 345 EncryptedMediaTestBase::SetUpCommandLine(command_line);
346 command_line->AppendSwitch(switches::kEnableEncryptedMedia); 346 command_line->AppendSwitch(switches::kEnableEncryptedMedia);
347 SetUpCommandLineForKeySystem(kExternalClearKeyKeySystem, command_line); 347 SetUpCommandLineForKeySystem(kExternalClearKeyKeySystem, command_line);
348 } 348 }
349 }; 349 };
350 350
351 #if defined(WIDEVINE_CDM_AVAILABLE) 351 #if defined(WIDEVINE_CDM_AVAILABLE)
352 // Tests encrypted media playback using Widevine key system. 352 // Tests encrypted media playback using Widevine key system.
353 class WVEncryptedMediaTest : public EncryptedMediaTestBase { 353 class WVEncryptedMediaTest : public EncryptedMediaTestBase {
354 protected: 354 protected:
355 virtual void SetUpCommandLine(base::CommandLine* command_line) override { 355 void SetUpCommandLine(base::CommandLine* command_line) override {
356 EncryptedMediaTestBase::SetUpCommandLine(command_line); 356 EncryptedMediaTestBase::SetUpCommandLine(command_line);
357 command_line->AppendSwitch(switches::kEnableEncryptedMedia); 357 command_line->AppendSwitch(switches::kEnableEncryptedMedia);
358 SetUpCommandLineForKeySystem(kWidevineKeySystem, command_line); 358 SetUpCommandLineForKeySystem(kWidevineKeySystem, command_line);
359 } 359 }
360 }; 360 };
361 361
362 #endif // defined(WIDEVINE_CDM_AVAILABLE) 362 #endif // defined(WIDEVINE_CDM_AVAILABLE)
363 #endif // defined(ENABLE_PEPPER_CDMS) 363 #endif // defined(ENABLE_PEPPER_CDMS)
364 364
365 // Tests encrypted media playback with a combination of parameters: 365 // Tests encrypted media playback with a combination of parameters:
(...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after
733 "bear-320x240-v_enc-v.webm", 733 "bear-320x240-v_enc-v.webm",
734 kWebMVideoOnly, 734 kWebMVideoOnly,
735 kExternalClearKeyKeySystem, 735 kExternalClearKeyKeySystem,
736 SRC, 736 SRC,
737 UNPREFIXED, 737 UNPREFIXED,
738 kUnknownSession, 738 kUnknownSession,
739 false, 739 false,
740 kEmeKeyError); 740 kEmeKeyError);
741 } 741 }
742 #endif // defined(ENABLE_PEPPER_CDMS) 742 #endif // defined(ENABLE_PEPPER_CDMS)
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698