Revert 121901 - PPAPI: Add unlocking for PPP calls and callbacks. Add more locking.

ppapi/shared_impl/tracked_callback.cc

Index: ppapi/shared_impl/tracked_callback.cc
===================================================================
--- ppapi/shared_impl/tracked_callback.cc	(revision 121902)
+++ ppapi/shared_impl/tracked_callback.cc	(working copy)
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 
@@ -12,7 +12,6 @@
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/shared_impl/callback_tracker.h"
 #include "ppapi/shared_impl/ppapi_globals.h"
-#include "ppapi/shared_impl/proxy_lock.h"
 #include "ppapi/shared_impl/resource.h"
 
 namespace ppapi {
@@ -50,8 +49,8 @@
     if (!abort_impl_factory_.HasWeakPtrs()) {
       MessageLoop::current()->PostTask(
           FROM_HERE,
-          RunWhileLocked(base::Bind(&TrackedCallback::Abort,
-                                    abort_impl_factory_.GetWeakPtr())));
+          base::Bind(&TrackedCallback::Abort,
+                     abort_impl_factory_.GetWeakPtr()));
     }
   }
 }
@@ -70,7 +69,7 @@
     // Do this before running the callback in case of reentrancy (which
     // shouldn't happen, but avoid strange failures).
     MarkAsCompleted();
-    CallWhileUnlocked(PP_RunCompletionCallback, &callback, result);
+    PP_RunCompletionCallback(&callback, result);
   }
 }