chrome/test/ppapi/ppapi_browsertest.cc - Issue 15491006: Rename PPB_Flash_DeviceID interface to PPB_Flash_DRM

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 15491006: Rename PPB_Flash_DeviceID interface to PPB_Flash_DRM (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 7 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 | Annotate | Revision Log

« no previous file with comments | « chrome/chrome_browser.gypi ('k') | ppapi/api/private/ppb_flash_device_id.idl » ('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 1300 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1311 #if defined(OS_MACOSX)	1311 #if defined(OS_MACOSX)

1312 #define MAYBE_FlashFullscreen DISABLED_FlashFullscreen	1312 #define MAYBE_FlashFullscreen DISABLED_FlashFullscreen

1313 #else	1313 #else

1314 #define MAYBE_FlashFullscreen FlashFullscreen	1314 #define MAYBE_FlashFullscreen FlashFullscreen

1315 #endif	1315 #endif

1316 TEST_PPAPI_OUT_OF_PROCESS(MAYBE_FlashFullscreen)	1316 TEST_PPAPI_OUT_OF_PROCESS(MAYBE_FlashFullscreen)

1317	1317

1318 TEST_PPAPI_OUT_OF_PROCESS(PDF)	1318 TEST_PPAPI_OUT_OF_PROCESS(PDF)

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

1320 #if (defined(OS_WIN) && defined(ENABLE_RLZ)) \|\| defined(OS_CHROMEOS)	1320 #if (defined(OS_WIN) && defined(ENABLE_RLZ)) \|\| defined(OS_CHROMEOS)

1321 TEST_PPAPI_OUT_OF_PROCESS(FlashDeviceID)	1321 TEST_PPAPI_OUT_OF_PROCESS(FlashDRM)

1322 #endif	1322 #endif

1323	1323

1324 TEST_PPAPI_IN_PROCESS(TalkPrivate)	1324 TEST_PPAPI_IN_PROCESS(TalkPrivate)

1325 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate)	1325 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate)

1326	1326

1327 #endif // ADDRESS_SANITIZER	1327 #endif // ADDRESS_SANITIZER

OLD	NEW