chrome/browser/media/encrypted_media_browsertest.cc - Issue 1550593002: Switch to standard integer types in chrome/browser/, part 2 of 4.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1550593002: Switch to standard integer types in chrome/browser/, part 2 of 4. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 12 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

OLD	NEW
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 "build/build_config.h"

10 #include "chrome/browser/media/media_browsertest.h"	11 #include "chrome/browser/media/media_browsertest.h"

11 #include "chrome/browser/media/test_license_server.h"	12 #include "chrome/browser/media/test_license_server.h"

12 #include "chrome/browser/media/wv_test_license_server_config.h"	13 #include "chrome/browser/media/wv_test_license_server_config.h"

13 #include "chrome/browser/ui/browser.h"	14 #include "chrome/browser/ui/browser.h"

14 #include "chrome/browser/ui/tabs/tab_strip_model.h"	15 #include "chrome/browser/ui/tabs/tab_strip_model.h"

15 #include "chrome/common/chrome_switches.h"	16 #include "chrome/common/chrome_switches.h"

16 #include "content/public/common/content_switches.h"	17 #include "content/public/common/content_switches.h"

17 #include "content/public/test/browser_test_utils.h"	18 #include "content/public/test/browser_test_utils.h"

18 #include "testing/gtest/include/gtest/gtest-spi.h"	19 #include "testing/gtest/include/gtest/gtest-spi.h"

19 #if defined(OS_ANDROID)	20 #if defined(OS_ANDROID)

(...skipping 820 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
840 }	841 }

841	842

842 IN_PROC_BROWSER_TEST_F(ECKPrefixedEncryptedMediaTest, LoadLoadableSession) {	843 IN_PROC_BROWSER_TEST_F(ECKPrefixedEncryptedMediaTest, LoadLoadableSession) {

843 TestPlaybackCase(kLoadableSession, kEnded);	844 TestPlaybackCase(kLoadableSession, kEnded);

844 }	845 }

845	846

846 IN_PROC_BROWSER_TEST_F(ECKPrefixedEncryptedMediaTest, LoadUnknownSession) {	847 IN_PROC_BROWSER_TEST_F(ECKPrefixedEncryptedMediaTest, LoadUnknownSession) {

847 TestPlaybackCase(kUnknownSession, kPrefixedEmeErrorEvent);	848 TestPlaybackCase(kUnknownSession, kPrefixedEmeErrorEvent);

848 }	849 }

849 #endif // defined(ENABLE_PEPPER_CDMS)	850 #endif // defined(ENABLE_PEPPER_CDMS)

OLD	NEW