Revert 186416

gpu/command_buffer/service/vertex_attrib_manager_unittest.cc

Index: gpu/command_buffer/service/vertex_attrib_manager_unittest.cc
===================================================================
--- gpu/command_buffer/service/vertex_attrib_manager_unittest.cc	(revision 186458)
+++ gpu/command_buffer/service/vertex_attrib_manager_unittest.cc	(working copy)
@@ -7,7 +7,6 @@
 #include "base/memory/scoped_ptr.h"
 #include "gpu/command_buffer/service/buffer_manager.h"
 #include "gpu/command_buffer/service/feature_info.h"
-#include "gpu/command_buffer/service/gles2_cmd_decoder_mock.h"
 #include "gpu/command_buffer/service/test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gl/gl_mock.h"
@@ -110,7 +109,7 @@
 }
 
 TEST_F(VertexAttribManagerTest, SetAttribInfo) {
-  BufferManager buffer_manager(NULL, NULL);
+  BufferManager buffer_manager(NULL);
   buffer_manager.CreateBuffer(1, 2);
   Buffer* buffer = buffer_manager.GetBuffer(1);
   ASSERT_TRUE(buffer != NULL);
@@ -146,8 +145,7 @@
 }
 
 TEST_F(VertexAttribManagerTest, CanAccess) {
-  MockGLES2Decoder decoder;
-  BufferManager buffer_manager(NULL, NULL);
+  BufferManager buffer_manager(NULL);
   buffer_manager.CreateBuffer(1, 2);
   Buffer* buffer = buffer_manager.GetBuffer(1);
   ASSERT_TRUE(buffer != NULL);
@@ -163,23 +161,17 @@
   EXPECT_FALSE(info->CanAccess(0));
 
   EXPECT_TRUE(buffer_manager.SetTarget(buffer, GL_ARRAY_BUFFER));
-  TestHelper::DoBufferData(
-      gl_.get(), &decoder, &buffer_manager, buffer, 15, GL_STATIC_DRAW, NULL,
-      GL_NO_ERROR);
+  buffer_manager.SetInfo(buffer, 15, GL_STATIC_DRAW);
 
   EXPECT_FALSE(info->CanAccess(0));
-  TestHelper::DoBufferData(
-      gl_.get(), &decoder, &buffer_manager, buffer, 16, GL_STATIC_DRAW, NULL,
-      GL_NO_ERROR);
+  buffer_manager.SetInfo(buffer, 16, GL_STATIC_DRAW);
   EXPECT_TRUE(info->CanAccess(0));
   EXPECT_FALSE(info->CanAccess(1));
 
   manager_->SetAttribInfo(1, buffer, 4, GL_FLOAT, GL_FALSE, 0, 16, 1);
   EXPECT_FALSE(info->CanAccess(0));
 
-  TestHelper::DoBufferData(
-      gl_.get(), &decoder, &buffer_manager, buffer, 32, GL_STATIC_DRAW, NULL,
-      GL_NO_ERROR);
+  buffer_manager.SetInfo(buffer, 32, GL_STATIC_DRAW);
   EXPECT_TRUE(info->CanAccess(0));
   EXPECT_FALSE(info->CanAccess(1));
   manager_->SetAttribInfo(1, buffer, 4, GL_FLOAT, GL_FALSE, 0, 16, 0);
@@ -195,7 +187,7 @@
 }
 
 TEST_F(VertexAttribManagerTest, Unbind) {
-  BufferManager buffer_manager(NULL, NULL);
+  BufferManager buffer_manager(NULL);
   buffer_manager.CreateBuffer(1, 2);
   buffer_manager.CreateBuffer(3, 4);
   Buffer* buffer1 = buffer_manager.GetBuffer(1);
@@ -231,9 +223,6 @@
   buffer_manager.Destroy(false);
 }
 
-// TODO(gman): Test ValidateBindings
-// TODO(gman): Test ValidateBindings with client side arrays.
-
 }  // namespace gles2
 }  // namespace gpu