diff options
| author | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-21 20:33:12 +0000 |
|---|---|---|
| committer | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-21 20:33:12 +0000 |
| commit | 7d792aba8f7c901d11820f25cd014ec43435ad02 (patch) | |
| tree | 2bc384bba93afd793a9e73e89b81a6d7696a7079 /ppapi/proxy/flash_resource_unittest.cc | |
| parent | cccb13dbf6a113811ae68c96c30b65491dd9427d (diff) | |
| download | chromium_src-7d792aba8f7c901d11820f25cd014ec43435ad02.zip chromium_src-7d792aba8f7c901d11820f25cd014ec43435ad02.tar.gz chromium_src-7d792aba8f7c901d11820f25cd014ec43435ad02.tar.bz2 | |
Revert 189518 "PPAPI: Remove threading options; it's always on"
This is an experimental revert to see if it helps with imaging-darkroom on Kraken.
BUG=222741,159240,92909
> PPAPI: Remove threading options; it's always on
>
> This also re-enables thread checking for the host side resource and var trackers. Before, checking was disabled everywhere.
>
> BUG=159240,92909
>
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=186925
> Reverted: https://src.chromium.org/viewvc/chrome?view=rev&revision=186939 due to build errors
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=187340
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=187427
> Reverted: https://src.chromium.org/viewvc/chrome?view=rev&revision=187668 due to a failing check in Canary, which was fixed here: https://src.chromium.org/viewvc/chrome?view=rev&revision=187681
>
> Review URL: https://chromiumcodereview.appspot.com/12378050
TBR=dmichael@chromium.org
Review URL: https://codereview.chromium.org/12920003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@189682 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy/flash_resource_unittest.cc')
| -rw-r--r-- | ppapi/proxy/flash_resource_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ppapi/proxy/flash_resource_unittest.cc b/ppapi/proxy/flash_resource_unittest.cc index 1a5e7c6..ab22077 100644 --- a/ppapi/proxy/flash_resource_unittest.cc +++ b/ppapi/proxy/flash_resource_unittest.cc @@ -5,9 +5,9 @@ #include "ppapi/c/dev/ppb_video_capture_dev.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/private/ppb_flash.h" -#include "ppapi/proxy/locking_resource_releaser.h" #include "ppapi/proxy/ppapi_messages.h" #include "ppapi/proxy/ppapi_proxy_test.h" +#include "ppapi/shared_impl/scoped_pp_resource.h" #include "ppapi/thunk/thunk.h" namespace ppapi { @@ -43,7 +43,7 @@ TEST_F(FlashResourceTest, EnumerateVideoCaptureDevices) { sink().AddFilter(&enumerate_video_devices_handler); // Set up the arguments to the call. - LockingResourceReleaser video_capture( + ScopedPPResource video_capture(ScopedPPResource::PassRef(), ::ppapi::thunk::GetPPB_VideoCapture_Dev_0_3_Thunk()->Create( pp_instance())); std::vector<PP_Resource> unused; |