diff options
| -rw-r--r-- | base/SConscript | 16 | ||||
| -rw-r--r-- | base/build/base_unittests.vcproj | 2 | ||||
| -rw-r--r-- | base/gfx/platform_canvas_unittest_win.cc (renamed from base/gfx/platform_canvas_unittest.cc) | 0 |
3 files changed, 9 insertions, 9 deletions
diff --git a/base/SConscript b/base/SConscript index f5321bc..c754dc7 100644 --- a/base/SConscript +++ b/base/SConscript @@ -297,7 +297,6 @@ if env['PLATFORM'] == 'win32': 'timer_unittest.cc', 'watchdog_unittest.cc', 'gfx/native_theme_unittest.cc', - 'gfx/platform_canvas_unittest.cc', 'gfx/uniscribe_unittest.cc', 'gfx/vector_canvas_unittest.cc', ]) @@ -305,13 +304,14 @@ if env['PLATFORM'] == 'win32': if env['PLATFORM'] == 'win32': # Windows-specific tests. test_files.extend([ - 'file_version_info_unittest.cc', - 'object_watcher_unittest.cc', - 'pe_image_unittest.cc', - 'sys_string_conversions_win_unittest.cc', - 'win_util_unittest.cc', - 'wmi_util_unittest.cc', - ]) + 'file_version_info_unittest.cc', + 'object_watcher_unittest.cc', + 'pe_image_unittest.cc', + 'sys_string_conversions_win_unittest.cc', + 'win_util_unittest.cc', + 'wmi_util_unittest.cc', + 'gfx/platform_canvas_unittest_win.cc', + ]) base_unittests = env_tests.ChromeTestProgram('base_unittests', test_files) diff --git a/base/build/base_unittests.vcproj b/base/build/base_unittests.vcproj index cb3d1ef..53da8e1 100644 --- a/base/build/base_unittests.vcproj +++ b/base/build/base_unittests.vcproj @@ -360,7 +360,7 @@ > </File> <File - RelativePath="..\gfx\platform_canvas_unittest.cc" + RelativePath="..\gfx\platform_canvas_unittest_win.cc" > </File> <File diff --git a/base/gfx/platform_canvas_unittest.cc b/base/gfx/platform_canvas_unittest_win.cc index a9cf2ae..a9cf2ae 100644 --- a/base/gfx/platform_canvas_unittest.cc +++ b/base/gfx/platform_canvas_unittest_win.cc |