Revert 278728 "[PPAPI] Add browser tests for compositor API"

trunk/src/ppapi/proxy/compositor_resource.h

Index: trunk/src/ppapi/proxy/compositor_resource.h
===================================================================
--- trunk/src/ppapi/proxy/compositor_resource.h	(revision 278764)
+++ trunk/src/ppapi/proxy/compositor_resource.h	(working copy)
@@ -10,7 +10,6 @@
 #include "ppapi/proxy/compositor_layer_resource.h"
 #include "ppapi/proxy/plugin_resource.h"
 #include "ppapi/proxy/ppapi_proxy_export.h"
-#include "ppapi/shared_impl/proxy_lock.h"
 #include "ppapi/thunk/ppb_compositor_api.h"
 
 namespace ppapi {
@@ -23,9 +22,13 @@
   CompositorResource(Connection connection,
                      PP_Instance instance);
 
-  bool IsInProgress() const;
+  bool IsInProgress() const {
+    return TrackedCallback::IsPending(commit_callback_);
+  }
 
-  int32_t GenerateResourceId() const;
+  int32_t GenerateResourceId() const {
+    return ++last_resource_id_;
+  }
 
  private:
   virtual ~CompositorResource();
@@ -51,7 +54,7 @@
       uint32_t sync_point,
       bool is_lost);
 
-  void ResetLayersInternal(bool is_aborted);
+  void ResetLayersInternal();
 
   // Callback for CommitLayers().
   scoped_refptr<TrackedCallback> commit_callback_;