content/gpu/gpu_info_collector_unittest_win.cc - Issue 11576052: Revert 173248, broke building on the official chrome/win bot:

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 11576052: Revert 173248, broke building on the official chrome/win bot: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years 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 »

OLD	NEW
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_idirect3d9_mock_win.h"	6 #include "content/gpu/gpu_idirect3d9_mock_win.h"

7 #include "content/gpu/gpu_info_collector.h"	7 #include "content/gpu/gpu_info_collector.h"

8 #include "content/public/common/gpu_info.h"	8 #include "content/public/common/gpu_info.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"

(...skipping 36 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
47 content::GPUInfo gpu_info;	47 content::GPUInfo gpu_info;

48 ASSERT_TRUE(gpu_info_collector::CollectGraphicsInfoD3D(&d3d_, &gpu_info));	48 ASSERT_TRUE(gpu_info_collector::CollectGraphicsInfoD3D(&d3d_, &gpu_info));

49 EXPECT_EQ(gpu_info.pixel_shader_version, "3.0");	49 EXPECT_EQ(gpu_info.pixel_shader_version, "3.0");

50 }	50 }

51	51

52 TEST_F(GPUInfoTest, VertexShaderVersionD3D) {	52 TEST_F(GPUInfoTest, VertexShaderVersionD3D) {

53 content::GPUInfo gpu_info;	53 content::GPUInfo gpu_info;

54 ASSERT_TRUE(gpu_info_collector::CollectGraphicsInfoD3D(&d3d_, &gpu_info));	54 ASSERT_TRUE(gpu_info_collector::CollectGraphicsInfoD3D(&d3d_, &gpu_info));

55 EXPECT_EQ(gpu_info.vertex_shader_version, "3.0");	55 EXPECT_EQ(gpu_info.vertex_shader_version, "3.0");

56 }	56 }

OLD	NEW