Revert 93066 - Execute all GL commands up to the put offset reported by a each flush.This means g...

gpu/command_buffer/client/gles2_implementation_unittest.cc

 // Copyright (c) 2011 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.
 
 // Tests for the Command Buffer Helper.
 
 #include "gpu/command_buffer/client/gles2_implementation.h"
 #include "gpu/command_buffer/common/command_buffer.h"
 #include "gpu/GLES2/gles2_command_buffer.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 28 matching lines @@
   }
 
   virtual Buffer GetRingBuffer() {
     return ring_buffer_buffer_;
   }
 
   virtual State GetState() {
     return state_;
   }
 
-  virtual State GetLastState() {
-    return state_;
-  }
-
   virtual void Flush(int32 put_offset) {
     state_.put_offset = put_offset;
   }
 
   virtual State FlushSync(int32 put_offset, int32 last_known_get) {
     state_.put_offset = put_offset;
     state_.get_offset = put_offset;
     OnFlush(transfer_buffer_buffer_.ptr);
 
     return state_;
@@ skipping 192 matching lines @@
     GetNextToken();  // eat the token that starting up will use.
 
     gl_.reset(new GLES2Implementation(
         helper_.get(),
         kTransferBufferSize,
         transfer_buffer_.ptr,
         kTransferBufferId,
         false));
 
     EXPECT_CALL(*command_buffer_, OnFlush(_)).Times(1).RetiresOnSaturation();
-    helper_->CommandBufferHelper::Finish();
+    helper_->CommandBufferHelper::FlushSync();
     Buffer ring_buffer = command_buffer_->GetRingBuffer();
     commands_ = static_cast<CommandBufferEntry*>(ring_buffer.ptr) +
                 command_buffer_->GetState().put_offset;
     ClearCommands();
   }
 
   virtual void TearDown() {
   }
 
   void ClearCommands() {
@@ skipping 1040 matching lines @@
   EXPECT_CALL(*command_buffer_, OnFlush(_))
       .WillOnce(SetMemory(GLuint(GL_NO_ERROR)))
       .RetiresOnSaturation();
   EXPECT_EQ(static_cast<GLenum>(GL_NO_ERROR), gl_->GetError());
 }
 
 }  // namespace gles2
 }  // namespace gpu