Revert 189518 "PPAPI: Remove threading options; it's always on"

trunk/src/ppapi/proxy/ppp_instance_proxy_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/synchronization/waitable_event.h"
 #include "ipc/ipc_message_utils.h"
 #include "ppapi/c/pp_var.h"
 #include "ppapi/c/ppb_core.h"
 #include "ppapi/c/ppb_fullscreen.h"
 #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 {
 
 namespace {
 // This is a poor man's mock of PPP_Instance using global variables.  Eventually
 // we should generalize making PPAPI interface mocks by using IDL or macro/
 // template magic.
 PP_Instance received_instance;
 uint32_t received_argc;
@@ skipping 129 matching lines @@
 
   PP_Rect expected_position = { {1, 2}, {3, 4} };
   PP_Rect expected_clip = { {5, 6}, {7, 8} };
   ViewData data;
   data.rect = expected_position;
   data.is_fullscreen = false;
   data.is_page_visible = true;
   data.clip_rect = expected_clip;
   data.device_scale = 1.0f;
   ResetReceived();
-  LockingResourceReleaser view_resource(
+  ScopedPPResource view_resource(
+      ScopedPPResource::PassRef(),
       (new PPB_View_Shared(OBJECT_IS_IMPL,
                            expected_instance, data))->GetReference());
-  ppp_instance->DidChangeView(expected_instance, view_resource.get());
+  ppp_instance->DidChangeView(expected_instance, view_resource);
   did_change_view_called.Wait();
   EXPECT_EQ(received_instance, expected_instance);
   EXPECT_EQ(received_position.point.x, expected_position.point.x);
   EXPECT_EQ(received_position.point.y, expected_position.point.y);
   EXPECT_EQ(received_position.size.width, expected_position.size.width);
   EXPECT_EQ(received_position.size.height, expected_position.size.height);
   EXPECT_EQ(received_clip.point.x, expected_clip.point.x);
   EXPECT_EQ(received_clip.point.y, expected_clip.point.y);
   EXPECT_EQ(received_clip.size.width, expected_clip.size.width);
   EXPECT_EQ(received_clip.size.height, expected_clip.size.height);
 
   PP_Bool expected_has_focus = PP_TRUE;
   ResetReceived();
   ppp_instance->DidChangeFocus(expected_instance, expected_has_focus);
   did_change_focus_called.Wait();
   EXPECT_EQ(received_instance, expected_instance);
   EXPECT_EQ(received_has_focus, expected_has_focus);
 
   //  TODO(dmichael): Need to mock out a resource Tracker to be able to test
   //                  HandleResourceLoad. It also requires
   //                  PPB_Core.AddRefResource and for PPB_URLLoader to be
   //                  registered.
 
   host().resource_tracker().DidDeleteInstance(expected_instance);
 }
 
 }  // namespace proxy
 }  // namespace ppapi