chrome/test/ppapi/ppapi_browsertest.cc - Issue 11415140: Refactor 3 PPB_Flash functions to the new resource model.

Side by Side Diff: chrome/test/ppapi/ppapi_browsertest.cc

Issue 11415140: Refactor 3 PPB_Flash functions to the new resource model. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: . Created 8 years 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 | « no previous file | content/browser/renderer_host/pepper/content_browser_pepper_host_factory.h » ('j') | content/browser/renderer_host/pepper/content_browser_pepper_host_factory.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 656 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
667 TEST_PPAPI_OUT_OF_PROCESS(NetworkMonitorPrivate_Basic)	667 TEST_PPAPI_OUT_OF_PROCESS(NetworkMonitorPrivate_Basic)

668 TEST_PPAPI_OUT_OF_PROCESS(NetworkMonitorPrivate_2Monitors)	668 TEST_PPAPI_OUT_OF_PROCESS(NetworkMonitorPrivate_2Monitors)

669 TEST_PPAPI_OUT_OF_PROCESS(NetworkMonitorPrivate_DeleteInCallback)	669 TEST_PPAPI_OUT_OF_PROCESS(NetworkMonitorPrivate_DeleteInCallback)

670 TEST_PPAPI_OUT_OF_PROCESS(NetworkMonitorPrivate_ListObserver)	670 TEST_PPAPI_OUT_OF_PROCESS(NetworkMonitorPrivate_ListObserver)

671 TEST_PPAPI_NACL_VIA_HTTP(NetworkMonitorPrivate_Basic)	671 TEST_PPAPI_NACL_VIA_HTTP(NetworkMonitorPrivate_Basic)

672 TEST_PPAPI_NACL_VIA_HTTP(NetworkMonitorPrivate_2Monitors)	672 TEST_PPAPI_NACL_VIA_HTTP(NetworkMonitorPrivate_2Monitors)

673 TEST_PPAPI_NACL_VIA_HTTP(NetworkMonitorPrivate_DeleteInCallback)	673 TEST_PPAPI_NACL_VIA_HTTP(NetworkMonitorPrivate_DeleteInCallback)

674 TEST_PPAPI_NACL_VIA_HTTP(NetworkMonitorPrivate_ListObserver)	674 TEST_PPAPI_NACL_VIA_HTTP(NetworkMonitorPrivate_ListObserver)

675	675

676 TEST_PPAPI_IN_PROCESS(Flash_SetInstanceAlwaysOnTop)	676 TEST_PPAPI_IN_PROCESS(Flash_SetInstanceAlwaysOnTop)

677 TEST_PPAPI_IN_PROCESS(Flash_GetProxyForURL)

678 TEST_PPAPI_IN_PROCESS(Flash_GetLocalTimeZoneOffset)	677 TEST_PPAPI_IN_PROCESS(Flash_GetLocalTimeZoneOffset)

679 TEST_PPAPI_IN_PROCESS(Flash_GetCommandLineArgs)	678 TEST_PPAPI_IN_PROCESS(Flash_GetCommandLineArgs)

680 TEST_PPAPI_IN_PROCESS(Flash_GetSetting)	679 TEST_PPAPI_IN_PROCESS(Flash_GetSetting)

681 TEST_PPAPI_OUT_OF_PROCESS(Flash_SetInstanceAlwaysOnTop)	680 TEST_PPAPI_OUT_OF_PROCESS(Flash_SetInstanceAlwaysOnTop)

682 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetProxyForURL)

683 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetLocalTimeZoneOffset)	681 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetLocalTimeZoneOffset)

684 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetCommandLineArgs)	682 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetCommandLineArgs)

685 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetSetting)	683 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetSetting)

686 // No in-process test for SetCrashData.	684 // No in-process test for SetCrashData.

687 TEST_PPAPI_OUT_OF_PROCESS(Flash_SetCrashData)	685 TEST_PPAPI_OUT_OF_PROCESS(Flash_SetCrashData)

688	686

689 // NaCl based PPAPI tests with WebSocket server	687 // NaCl based PPAPI tests with WebSocket server

690 TEST_PPAPI_IN_PROCESS(WebSocket_IsWebSocket)	688 TEST_PPAPI_IN_PROCESS(WebSocket_IsWebSocket)

691 TEST_PPAPI_IN_PROCESS(WebSocket_UninitializedPropertiesAccess)	689 TEST_PPAPI_IN_PROCESS(WebSocket_UninitializedPropertiesAccess)

692 TEST_PPAPI_IN_PROCESS(WebSocket_InvalidConnect)	690 TEST_PPAPI_IN_PROCESS(WebSocket_InvalidConnect)

(...skipping 216 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
909 // slowness, particularly on Windows XP. If this test times out, please try	907 // slowness, particularly on Windows XP. If this test times out, please try

910 // marking it SLOW_ before disabling.	908 // marking it SLOW_ before disabling.

911 // - dmichael	909 // - dmichael

912 // MessageLoop_Post starts a thread so only run it if pepper threads are	910 // MessageLoop_Post starts a thread so only run it if pepper threads are

913 // enabled.	911 // enabled.

914 #ifdef ENABLE_PEPPER_THREADING	912 #ifdef ENABLE_PEPPER_THREADING

915 TEST_PPAPI_OUT_OF_PROCESS(MessageLoop_Post)	913 TEST_PPAPI_OUT_OF_PROCESS(MessageLoop_Post)

916 #endif	914 #endif

917	915

918 // Going forward, Flash APIs will only work out-of-process.	916 // Going forward, Flash APIs will only work out-of-process.

	917 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetProxyForURL)

919 TEST_PPAPI_OUT_OF_PROCESS(FlashClipboard)	918 TEST_PPAPI_OUT_OF_PROCESS(FlashClipboard)

920 TEST_PPAPI_OUT_OF_PROCESS(FlashFile_CreateTemporaryFile)	919 TEST_PPAPI_OUT_OF_PROCESS(FlashFile_CreateTemporaryFile)

921	920

922 TEST_PPAPI_IN_PROCESS(TalkPrivate)	921 TEST_PPAPI_IN_PROCESS(TalkPrivate)

923 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate)	922 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate)

924	923

925 #endif // ADDRESS_SANITIZER	924 #endif // ADDRESS_SANITIZER

OLD	NEW