Revert 186925 since it breaks many of the builds on the bots (e.g.

ppapi/proxy/printing_resource_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 <cstring>
 
 #include "base/message_loop.h"
 #include "ppapi/c/dev/ppb_printing_dev.h"
 #include "ppapi/c/pp_errors.h"
-#include "ppapi/proxy/locking_resource_releaser.h"
 #include "ppapi/proxy/printing_resource.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/proxy/ppapi_proxy_test.h"
 #include "ppapi/thunk/thunk.h"
+#include "ppapi/shared_impl/scoped_pp_resource.h"
 
 namespace ppapi {
 namespace proxy {
 
 namespace {
 
 typedef PluginProxyTest PrintingResourceTest;
 
 bool g_callback_called;
 int32_t g_callback_result;
@@ skipping 15 matching lines @@
 
 }  // namespace
 
 // Does a full test of GetDefaultPrintSettings() and reply functionality in the
 // plugin side using the public C interfaces.
 TEST_F(PrintingResourceTest, GetDefaultPrintSettings) {
   g_callback_called = false;
 
   const PPB_Printing_Dev_0_7* printing_iface =
       thunk::GetPPB_Printing_Dev_0_7_Thunk();
-  LockingResourceReleaser res(printing_iface->Create(pp_instance()));
+  ScopedPPResource res(ScopedPPResource::PassRef(),
+                       printing_iface->Create(pp_instance()));
 
   PP_PrintSettings_Dev output_settings;
 
   int32_t result = printing_iface->GetDefaultPrintSettings(
-      res.get(), &output_settings, PP_MakeCompletionCallback(&Callback, NULL));
+      res, &output_settings, PP_MakeCompletionCallback(&Callback, NULL));
   ASSERT_EQ(PP_OK_COMPLETIONPENDING, result);
 
   // Should have sent a "GetDefaultPrintSettings" message.
   ResourceMessageCallParams params;
   IPC::Message msg;
   ASSERT_TRUE(sink().GetFirstResourceCallMatching(
       PpapiHostMsg_Printing_GetDefaultPrintSettings::ID, &params, &msg));
 
   // Synthesize a response with some random print settings.
   ResourceMessageReplyParams reply_params(params.pp_resource(),
@@ skipping 27 matching lines @@
             output_settings.print_scaling_option);
   EXPECT_EQ(reply_settings.grayscale, output_settings.grayscale);
   EXPECT_EQ(reply_settings.format, output_settings.format);
 
   EXPECT_EQ(g_callback_result, PP_OK);
   EXPECT_EQ(g_callback_called, true);
 }
 
 }  // namespace proxy
 }  // namespace ppapi