summaryrefslogtreecommitdiffstats
path: root/ppapi/proxy/ppp_instance_proxy_unittest.cc
diff options
context:
space:
mode:
authordmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-08 09:29:14 +0000
committerdmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-08 09:29:14 +0000
commit5c5dd2482e578f985608bc3c74eba69ee574eed3 (patch)
treed0f7dd4d2774f767793d3ca174c6f7e97701953a /ppapi/proxy/ppp_instance_proxy_unittest.cc
parentbddca151d88995d3156c75f3aaa52f47d0883776 (diff)
downloadchromium_src-5c5dd2482e578f985608bc3c74eba69ee574eed3.zip
chromium_src-5c5dd2482e578f985608bc3c74eba69ee574eed3.tar.gz
chromium_src-5c5dd2482e578f985608bc3c74eba69ee574eed3.tar.bz2
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 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@186925 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy/ppp_instance_proxy_unittest.cc')
-rw-r--r--ppapi/proxy/ppp_instance_proxy_unittest.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/ppapi/proxy/ppp_instance_proxy_unittest.cc b/ppapi/proxy/ppp_instance_proxy_unittest.cc
index 91775b0..e2df26e 100644
--- a/ppapi/proxy/ppp_instance_proxy_unittest.cc
+++ b/ppapi/proxy/ppp_instance_proxy_unittest.cc
@@ -10,10 +10,10 @@
#include "ppapi/c/ppb_url_loader.h"
#include "ppapi/c/ppp_instance.h"
#include "ppapi/c/private/ppb_flash_fullscreen.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/ppb_view_shared.h"
-#include "ppapi/shared_impl/scoped_pp_resource.h"
namespace ppapi {
namespace proxy {
@@ -163,11 +163,10 @@ TEST_F(PPP_Instance_ProxyTest, PPPInstance1_0) {
data.clip_rect = expected_clip;
data.device_scale = 1.0f;
ResetReceived();
- ScopedPPResource view_resource(
- ScopedPPResource::PassRef(),
+ LockingResourceReleaser view_resource(
(new PPB_View_Shared(OBJECT_IS_IMPL,
expected_instance, data))->GetReference());
- ppp_instance->DidChangeView(expected_instance, view_resource);
+ ppp_instance->DidChangeView(expected_instance, view_resource.get());
did_change_view_called.Wait();
EXPECT_EQ(received_instance, expected_instance);
EXPECT_EQ(received_position.point.x, expected_position.point.x);