Make more GL stuff auto-generated

gpu/command_buffer/service/vertex_array_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_array_manager.h"
 #include "gpu/command_buffer/service/vertex_attrib_manager.h"
 
 #include "base/memory/scoped_ptr.h"
-#include "gpu/command_buffer/common/gl_mock.h"
 #include "gpu/command_buffer/service/feature_info.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 {
 
 class VertexArrayManagerTest : public testing::Test {
  public:
   static const uint32 kNumVertexAttribs = 8;
@@ skipping 71 matching lines @@
   manager.Destroy(true);
   // Check that resources got freed.
   info1 = manager.GetVertexAttribManager(kClient1Id);
   ASSERT_TRUE(info1 == NULL);
 }
 
 }  // namespace gles2
 }  // namespace gpu