From a80f5ece3d46eeb0734cfca6c716d69e7ab7aaa2 Mon Sep 17 00:00:00 2001 From: "jam@chromium.org" Date: Thu, 20 Oct 2011 23:56:55 +0000 Subject: Move GPUInfo to content/public/common and put it into the content namespace. BUG=98716 Review URL: http://codereview.chromium.org/8363007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106637 0039d316-1c4b-4281-b951-d872f2087c98 --- content/gpu/gpu_info_collector_unittest.cc | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'content/gpu/gpu_info_collector_unittest.cc') diff --git a/content/gpu/gpu_info_collector_unittest.cc b/content/gpu/gpu_info_collector_unittest.cc index 9287af2..eaca0f2 100644 --- a/content/gpu/gpu_info_collector_unittest.cc +++ b/content/gpu/gpu_info_collector_unittest.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "base/memory/scoped_ptr.h" -#include "content/common/gpu/gpu_info.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" @@ -106,7 +106,7 @@ class GPUInfoCollectorTest : public testing::Test { public: // Use StrictMock to make 100% sure we know how GL will be called. scoped_ptr< ::testing::StrictMock< ::gfx::MockGLInterface> > gl_; - GPUInfo test_values_; + content::GPUInfo test_values_; }; // TODO(rlp): Test the vendor and device id collection if deemed necessary as @@ -115,7 +115,7 @@ class GPUInfoCollectorTest : public testing::Test { // TODO(kbr): re-enable these tests; see http://crbug.com/100285 . TEST_F(GPUInfoCollectorTest, DISABLED_DriverVendorGL) { - GPUInfo gpu_info; + content::GPUInfo gpu_info; gpu_info_collector::CollectGraphicsInfoGL(&gpu_info); EXPECT_EQ(test_values_.driver_vendor, gpu_info.driver_vendor); @@ -124,7 +124,7 @@ TEST_F(GPUInfoCollectorTest, DISABLED_DriverVendorGL) { // Skip Windows because the driver version is obtained from bot registry. #if !defined(OS_WIN) TEST_F(GPUInfoCollectorTest, DISABLED_DriverVersionGL) { - GPUInfo gpu_info; + content::GPUInfo gpu_info; gpu_info_collector::CollectGraphicsInfoGL(&gpu_info); EXPECT_EQ(test_values_.driver_version, gpu_info.driver_version); @@ -132,49 +132,49 @@ TEST_F(GPUInfoCollectorTest, DISABLED_DriverVersionGL) { #endif TEST_F(GPUInfoCollectorTest, DISABLED_PixelShaderVersionGL) { - GPUInfo gpu_info; + content::GPUInfo gpu_info; gpu_info_collector::CollectGraphicsInfoGL(&gpu_info); EXPECT_EQ(test_values_.pixel_shader_version, gpu_info.pixel_shader_version); } TEST_F(GPUInfoCollectorTest, DISABLED_VertexShaderVersionGL) { - GPUInfo gpu_info; + content::GPUInfo gpu_info; gpu_info_collector::CollectGraphicsInfoGL(&gpu_info); EXPECT_EQ(test_values_.vertex_shader_version, gpu_info.vertex_shader_version); } TEST_F(GPUInfoCollectorTest, DISABLED_GLVersionGL) { - GPUInfo gpu_info; + content::GPUInfo gpu_info; gpu_info_collector::CollectGraphicsInfoGL(&gpu_info); EXPECT_EQ(test_values_.gl_version, gpu_info.gl_version); } TEST_F(GPUInfoCollectorTest, DISABLED_GLVersionStringGL) { - GPUInfo gpu_info; + content::GPUInfo gpu_info; gpu_info_collector::CollectGraphicsInfoGL(&gpu_info); EXPECT_EQ(test_values_.gl_version_string, gpu_info.gl_version_string); } TEST_F(GPUInfoCollectorTest, DISABLED_GLRendererGL) { - GPUInfo gpu_info; + content::GPUInfo gpu_info; gpu_info_collector::CollectGraphicsInfoGL(&gpu_info); EXPECT_EQ(test_values_.gl_renderer, gpu_info.gl_renderer); } TEST_F(GPUInfoCollectorTest, DISABLED_GLVendorGL) { - GPUInfo gpu_info; + content::GPUInfo gpu_info; gpu_info_collector::CollectGraphicsInfoGL(&gpu_info); EXPECT_EQ(test_values_.gl_vendor, gpu_info.gl_vendor); } TEST_F(GPUInfoCollectorTest, DISABLED_GLExtensionsGL) { - GPUInfo gpu_info; + content::GPUInfo gpu_info; gpu_info_collector::CollectGraphicsInfoGL(&gpu_info); EXPECT_EQ(test_values_.gl_extensions, gpu_info.gl_extensions); -- cgit v1.1