Revert 260177 "By keeping track of transfer buffer usage (both s..."

trunk/src/gpu/command_buffer/client/buffer_tracker.h

Index: trunk/src/gpu/command_buffer/client/buffer_tracker.h
===================================================================
--- trunk/src/gpu/command_buffer/client/buffer_tracker.h	(revision 260192)
+++ trunk/src/gpu/command_buffer/client/buffer_tracker.h	(working copy)
@@ -35,8 +35,7 @@
           shm_offset_(shm_offset),
           address_(address),
           mapped_(false),
-          last_usage_token_(0),
-          last_async_upload_token_(0) {
+          transfer_ready_token_(0) {
     }
 
     GLenum id() const {
@@ -67,22 +66,14 @@
       return mapped_;
     }
 
-    void set_last_usage_token(int token) {
-      last_usage_token_ = token;
+    void set_transfer_ready_token(int token) {
+      transfer_ready_token_ = token;
     }
 
-    int last_usage_token() const {
-      return last_usage_token_;
+    uint32 transfer_ready_token() const {
+      return transfer_ready_token_;
     }
 
-    void set_last_async_upload_token(uint32 async_token) {
-      last_async_upload_token_ = async_token;
-    }
-
-    GLuint last_async_upload_token() const {
-      return last_async_upload_token_;
-    }
-
    private:
     friend class BufferTracker;
     friend class BufferTrackerTest;
@@ -93,8 +84,7 @@
     uint32 shm_offset_;
     void* address_;
     bool mapped_;
-    int32 last_usage_token_;
-    GLuint last_async_upload_token_;
+    int32 transfer_ready_token_;
   };
 
   BufferTracker(MappedMemoryManager* manager);
@@ -106,9 +96,7 @@
 
   // Frees the block of memory associated with buffer, pending the passage
   // of a token.
-  void FreePendingToken(Buffer* buffer, int32 token);
-  void Unmanage(Buffer* buffer);
-  void Free(Buffer* buffer);
+  void FreePendingToken(Buffer*, int32 token);
 
  private:
   typedef base::hash_map<GLuint, Buffer*> BufferMap;