| Index: chrome/test/ppapi/ppapi_browsertest.cc
|
| diff --git a/chrome/test/ppapi/ppapi_browsertest.cc b/chrome/test/ppapi/ppapi_browsertest.cc
|
| index 0b6aaeaa6c2d67db8e8e7357715993536e56339f..a615661ddd60b49e059cedad0a62ef036f90c32f 100644
|
| --- a/chrome/test/ppapi/ppapi_browsertest.cc
|
| +++ b/chrome/test/ppapi/ppapi_browsertest.cc
|
| @@ -675,10 +675,8 @@ TEST_PPAPI_NACL_VIA_HTTP(NetworkMonitorPrivate_ListObserver)
|
|
|
| TEST_PPAPI_IN_PROCESS(Flash_SetInstanceAlwaysOnTop)
|
| TEST_PPAPI_IN_PROCESS(Flash_GetCommandLineArgs)
|
| -TEST_PPAPI_IN_PROCESS(Flash_GetSetting)
|
| TEST_PPAPI_OUT_OF_PROCESS(Flash_SetInstanceAlwaysOnTop)
|
| TEST_PPAPI_OUT_OF_PROCESS(Flash_GetCommandLineArgs)
|
| -TEST_PPAPI_OUT_OF_PROCESS(Flash_GetSetting)
|
|
|
| // NaCl based PPAPI tests with WebSocket server
|
| TEST_PPAPI_IN_PROCESS(WebSocket_IsWebSocket)
|
| @@ -905,6 +903,7 @@ TEST_PPAPI_OUT_OF_PROCESS(MessageLoop_Post)
|
| // Going forward, Flash APIs will only work out-of-process.
|
| TEST_PPAPI_OUT_OF_PROCESS(Flash_GetLocalTimeZoneOffset)
|
| TEST_PPAPI_OUT_OF_PROCESS(Flash_GetProxyForURL)
|
| +TEST_PPAPI_OUT_OF_PROCESS(Flash_GetSetting)
|
| TEST_PPAPI_OUT_OF_PROCESS(Flash_SetCrashData)
|
| TEST_PPAPI_OUT_OF_PROCESS(FlashClipboard)
|
| TEST_PPAPI_OUT_OF_PROCESS(FlashFile)
|
|
|