Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(476)

Side by Side Diff: content/gpu/gpu_info_collector_unittest.cc

Issue 10392068: ui: Move gl/ directory out of gfx/, up to ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix mac_rel Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/gpu/gpu_info_collector_mac.mm ('k') | content/gpu/gpu_info_collector_win.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/memory/scoped_ptr.h" 5 #include "base/memory/scoped_ptr.h"
6 #include "content/gpu/gpu_info_collector.h" 6 #include "content/gpu/gpu_info_collector.h"
7 #include "content/public/common/gpu_info.h" 7 #include "content/public/common/gpu_info.h"
8 #include "gpu/command_buffer/common/gl_mock.h" 8 #include "gpu/command_buffer/common/gl_mock.h"
9 #include "testing/gmock/include/gmock/gmock.h" 9 #include "testing/gmock/include/gmock/gmock.h"
10 #include "testing/gtest/include/gtest/gtest.h" 10 #include "testing/gtest/include/gtest/gtest.h"
11 #include "ui/gfx/gl/gl_implementation.h" 11 #include "ui/gl/gl_implementation.h"
12 12
13 using ::gfx::MockGLInterface; 13 using ::gfx::MockGLInterface;
14 using ::testing::Return; 14 using ::testing::Return;
15 15
16 class GPUInfoCollectorTest : public testing::Test { 16 class GPUInfoCollectorTest : public testing::Test {
17 public: 17 public:
18 GPUInfoCollectorTest() {} 18 GPUInfoCollectorTest() {}
19 virtual ~GPUInfoCollectorTest() { } 19 virtual ~GPUInfoCollectorTest() { }
20 20
21 void SetUp() { 21 void SetUp() {
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 EXPECT_EQ(test_values_.gl_vendor, 172 EXPECT_EQ(test_values_.gl_vendor,
173 gpu_info.gl_vendor); 173 gpu_info.gl_vendor);
174 } 174 }
175 175
176 TEST_F(GPUInfoCollectorTest, DISABLED_GLExtensionsGL) { 176 TEST_F(GPUInfoCollectorTest, DISABLED_GLExtensionsGL) {
177 content::GPUInfo gpu_info; 177 content::GPUInfo gpu_info;
178 gpu_info_collector::CollectGraphicsInfoGL(&gpu_info); 178 gpu_info_collector::CollectGraphicsInfoGL(&gpu_info);
179 EXPECT_EQ(test_values_.gl_extensions, 179 EXPECT_EQ(test_values_.gl_extensions,
180 gpu_info.gl_extensions); 180 gpu_info.gl_extensions);
181 } 181 }
OLDNEW
« no previous file with comments | « content/gpu/gpu_info_collector_mac.mm ('k') | content/gpu/gpu_info_collector_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698