Make more GL stuff auto-generated

content/gpu/gpu_info_collector_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 "base/memory/scoped_ptr.h"
 #include "content/gpu/gpu_info_collector.h"
 #include "content/public/common/gpu_info.h"
-#include "gpu/command_buffer/common/gl_mock.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gl/gl_implementation.h"
+#include "ui/gl/gl_mock.h"
 
 using ::gfx::MockGLInterface;
 using ::testing::Return;
 
 class GPUInfoCollectorTest : public testing::Test {
  public:
   GPUInfoCollectorTest() {}
   virtual ~GPUInfoCollectorTest() { }
 
   void SetUp() {
@@ skipping 150 matching lines @@
   EXPECT_EQ(test_values_.gl_vendor,
             gpu_info.gl_vendor);
 }
 
 TEST_F(GPUInfoCollectorTest, DISABLED_GLExtensionsGL) {
   content::GPUInfo gpu_info;
   gpu_info_collector::CollectGraphicsInfoGL(&gpu_info);
   EXPECT_EQ(test_values_.gl_extensions,
             gpu_info.gl_extensions);
 }