diff options
| author | aberent@google.com <aberent@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-08 11:10:10 +0000 |
|---|---|---|
| committer | aberent@google.com <aberent@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-08 11:10:10 +0000 |
| commit | 0dfb613d4dc52d0de7b95efe71d935ef12fbd4ce (patch) | |
| tree | a44e550a178c8abb56f84ee53ac597beeca85896 /ppapi/proxy/flash_resource_unittest.cc | |
| parent | 4867eb0439663745aace33be72575cbe09608a59 (diff) | |
| download | chromium_src-0dfb613d4dc52d0de7b95efe71d935ef12fbd4ce.zip chromium_src-0dfb613d4dc52d0de7b95efe71d935ef12fbd4ce.tar.gz chromium_src-0dfb613d4dc52d0de7b95efe71d935ef12fbd4ce.tar.bz2 | |
Revert 186925 since it breaks many of the builds on the bots (e.g.
http://build.chromium.org/p/chromium.perf/builders/Win%20Builder/builds/45240/steps/compile/logs/stdio).
> 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
>
>
> Review URL: https://chromiumcodereview.appspot.com/12378050
TBR=dmichael@chromium.org
Review URL: https://codereview.chromium.org/12504007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@186939 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; |