Revert "Revert 186416"

gpu/command_buffer/service/vertex_attrib_manager_unittest.cc

 // Copyright (c) 2012 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.
 
 #include "gpu/command_buffer/service/vertex_attrib_manager.h"
 
 #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"
 
 using ::testing::Pointee;
 using ::testing::_;
 
 namespace gpu {
 namespace gles2 {
 
@@ skipping 82 matching lines @@
   manager_->Enable(1, false);
   ASSERT_EQ(1u, infos.size());
   EXPECT_FALSE(info1->enabled());
 
   manager_->Enable(3, false);
   ASSERT_EQ(0u, infos.size());
   EXPECT_FALSE(info2->enabled());
 }
 
 TEST_F(VertexAttribManagerTest, SetAttribInfo) {
-  BufferManager buffer_manager(NULL);
+  BufferManager buffer_manager(NULL, NULL);
   buffer_manager.CreateBuffer(1, 2);
   Buffer* buffer = buffer_manager.GetBuffer(1);
   ASSERT_TRUE(buffer != NULL);
 
   VertexAttrib* info =
       manager_->GetVertexAttrib(1);
 
   manager_->SetAttribInfo(1, buffer, 3, GL_SHORT, GL_TRUE, 32, 32, 4);
 
   EXPECT_EQ(buffer, info->buffer());
@@ skipping 15 matching lines @@
   EXPECT_TRUE(manager_->HaveFixedAttribs());
   manager_->SetAttribInfo(3, NULL, 4, GL_FIXED, GL_FALSE, 0, 16, 0);
   EXPECT_TRUE(manager_->HaveFixedAttribs());
   manager_->SetAttribInfo(1, NULL, 4, GL_FLOAT, GL_FALSE, 0, 16, 0);
   EXPECT_TRUE(manager_->HaveFixedAttribs());
   manager_->SetAttribInfo(3, NULL, 4, GL_FLOAT, GL_FALSE, 0, 16, 0);
   EXPECT_FALSE(manager_->HaveFixedAttribs());
 }
 
 TEST_F(VertexAttribManagerTest, CanAccess) {
-  BufferManager buffer_manager(NULL);
+  MockGLES2Decoder decoder;
+  BufferManager buffer_manager(NULL, NULL);
   buffer_manager.CreateBuffer(1, 2);
   Buffer* buffer = buffer_manager.GetBuffer(1);
   ASSERT_TRUE(buffer != NULL);
 
   VertexAttrib* info =
       manager_->GetVertexAttrib(1);
 
   EXPECT_TRUE(info->CanAccess(0));
   manager_->Enable(1, true);
   EXPECT_FALSE(info->CanAccess(0));
 
   manager_->SetAttribInfo(1, buffer, 4, GL_FLOAT, GL_FALSE, 0, 16, 0);
   EXPECT_FALSE(info->CanAccess(0));
 
   EXPECT_TRUE(buffer_manager.SetTarget(buffer, GL_ARRAY_BUFFER));
-  buffer_manager.SetInfo(buffer, 15, GL_STATIC_DRAW);
+  TestHelper::DoBufferData(
+      gl_.get(), &decoder, &buffer_manager, buffer, 15, GL_STATIC_DRAW, NULL,
+      GL_NO_ERROR);
 
   EXPECT_FALSE(info->CanAccess(0));
-  buffer_manager.SetInfo(buffer, 16, GL_STATIC_DRAW);
+  TestHelper::DoBufferData(
+      gl_.get(), &decoder, &buffer_manager, buffer, 16, GL_STATIC_DRAW, NULL,
+      GL_NO_ERROR);
   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));
 
-  buffer_manager.SetInfo(buffer, 32, GL_STATIC_DRAW);
+  TestHelper::DoBufferData(
+      gl_.get(), &decoder, &buffer_manager, buffer, 32, GL_STATIC_DRAW, NULL,
+      GL_NO_ERROR);
   EXPECT_TRUE(info->CanAccess(0));
   EXPECT_FALSE(info->CanAccess(1));
   manager_->SetAttribInfo(1, buffer, 4, GL_FLOAT, GL_FALSE, 0, 16, 0);
   EXPECT_TRUE(info->CanAccess(1));
   manager_->SetAttribInfo(1, buffer, 4, GL_FLOAT, GL_FALSE, 0, 20, 0);
   EXPECT_TRUE(info->CanAccess(0));
   EXPECT_FALSE(info->CanAccess(1));
 
   // The VertexAttribManager must be destroyed before the BufferManager
   // so it releases its buffers.
   manager_ = NULL;
   buffer_manager.Destroy(false);
 }
 
 TEST_F(VertexAttribManagerTest, Unbind) {
-  BufferManager buffer_manager(NULL);
+  BufferManager buffer_manager(NULL, NULL);
   buffer_manager.CreateBuffer(1, 2);
   buffer_manager.CreateBuffer(3, 4);
   Buffer* buffer1 = buffer_manager.GetBuffer(1);
   Buffer* buffer2 = buffer_manager.GetBuffer(3);
   ASSERT_TRUE(buffer1 != NULL);
   ASSERT_TRUE(buffer2 != NULL);
 
   VertexAttrib* info1 =
       manager_->GetVertexAttrib(1);
   VertexAttrib* info3 =
@@ skipping 15 matching lines @@
   // Check they were detached
   EXPECT_TRUE(NULL == info1->buffer());
   EXPECT_TRUE(NULL == info3->buffer());
 
   // The VertexAttribManager must be destroyed before the BufferManager
   // so it releases its buffers.
   manager_ = NULL;
   buffer_manager.Destroy(false);
 }
 
+// TODO(gman): Test ValidateBindings
+// TODO(gman): Test ValidateBindings with client side arrays.
+
 }  // namespace gles2
 }  // namespace gpu