chrome/test/ppapi/ppapi_browsertest.cc - Issue 24039002: Pepper API implementation for output protection.

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/test/ppapi/ppapi_browsertest.cc

Issue 24039002: Pepper API implementation for output protection. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: fix build for non-chromeos Created 7 years, 2 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 | « chrome/chrome_browser.gypi ('k') | chromeos/display/output_configurator.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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 "chrome/test/ppapi/ppapi_test.h"	5 #include "chrome/test/ppapi/ppapi_test.h"

6	6

7 #include "base/test/test_timeouts.h"	7 #include "base/test/test_timeouts.h"

8 #include "build/build_config.h"	8 #include "build/build_config.h"

9 #include "chrome/browser/content_settings/host_content_settings_map.h"	9 #include "chrome/browser/content_settings/host_content_settings_map.h"

10 #include "chrome/browser/profiles/profile.h"	10 #include "chrome/browser/profiles/profile.h"

(...skipping 1522 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1533 #if (defined(OS_WIN) && defined(ENABLE_RLZ)) \|\| defined(OS_CHROMEOS)	1533 #if (defined(OS_WIN) && defined(ENABLE_RLZ)) \|\| defined(OS_CHROMEOS)

1534 // Only implemented on Windows and ChromeOS currently.	1534 // Only implemented on Windows and ChromeOS currently.

1535 LIST_TEST(FlashDRM_GetDeviceID)	1535 LIST_TEST(FlashDRM_GetDeviceID)

1536 #endif	1536 #endif

1537 LIST_TEST(FlashDRM_GetHmonitor)	1537 LIST_TEST(FlashDRM_GetHmonitor)

1538 LIST_TEST(FlashDRM_GetVoucherFile));	1538 LIST_TEST(FlashDRM_GetVoucherFile));

1539 }	1539 }

1540	1540

1541 TEST_PPAPI_IN_PROCESS(TalkPrivate)	1541 TEST_PPAPI_IN_PROCESS(TalkPrivate)

1542 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate)	1542 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate)

	1543

	1544 #if defined(OS_CHROMEOS)

	1545 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate)

	1546 #endif

OLD	NEW