From 806f5641c61ed70ac86263eeeed038a3ac6302eb Mon Sep 17 00:00:00 2001
From: "maruel@chromium.org"
 <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Thu, 22 Jan 2009 16:41:44 +0000
Subject: Add back convolver_unittest.cc and image_operations_unittest.cc. Fix
 a TODO in platform_canvas_unittest.cc. Make vector_canvas_unittest.cc
 slightly less dependent on base/. Remove Windows 2000 checks.

BUG=5113
Review URL: http://codereview.chromium.org/18623

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8458 0039d316-1c4b-4281-b951-d872f2087c98
---
 webkit/tools/test_shell/SConscript                | 3 +++
 webkit/tools/test_shell/image_decoder_unittest.cc | 2 +-
 webkit/tools/test_shell/test_shell_tests.vcproj   | 8 ++++++++
 3 files changed, 12 insertions(+), 1 deletion(-)

(limited to 'webkit')

diff --git a/webkit/tools/test_shell/SConscript b/webkit/tools/test_shell/SConscript
index 90291a1..09199df 100644
--- a/webkit/tools/test_shell/SConscript
+++ b/webkit/tools/test_shell/SConscript
@@ -230,6 +230,9 @@ test_files = [
     'run_all_tests.cc',
     'test_shell_test.cc',
     'text_input_controller_unittest.cc',
+    '$SKIA_DIR/skia/ext/convolver_unittest.cc',
+    '$SKIA_DIR/skia/ext/platform_canvas_unittest.cc',
+    '$SKIA_DIR/skia/ext/vector_canvas_unittest.cc',
     '$WEBKIT_DIR/glue/bookmarklet_unittest.cc',
     '$WEBKIT_DIR/glue/context_menu_unittest.cc',
     '$WEBKIT_DIR/glue/cpp_bound_class_unittest.cc',
diff --git a/webkit/tools/test_shell/image_decoder_unittest.cc b/webkit/tools/test_shell/image_decoder_unittest.cc
index b3745fa..89ed594 100644
--- a/webkit/tools/test_shell/image_decoder_unittest.cc
+++ b/webkit/tools/test_shell/image_decoder_unittest.cc
@@ -82,7 +82,7 @@ void ImageDecoderTest::SetUp() {
   file_util::AppendToPath(&data_dir_, L"webkit");
   file_util::AppendToPath(&data_dir_, L"data");
   file_util::AppendToPath(&data_dir_, format_ + L"_decoder");
-  ASSERT_TRUE(file_util::PathExists(data_dir_));
+  ASSERT_TRUE(file_util::PathExists(data_dir_)) << data_dir_;
 }
 
 std::vector<std::wstring> ImageDecoderTest::GetImageFiles() const {
diff --git a/webkit/tools/test_shell/test_shell_tests.vcproj b/webkit/tools/test_shell/test_shell_tests.vcproj
index ff0a6b2..2b0bb22 100644
--- a/webkit/tools/test_shell/test_shell_tests.vcproj
+++ b/webkit/tools/test_shell/test_shell_tests.vcproj
@@ -307,6 +307,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\skia\ext\convolver_unittest.cc"
+				>
+			</File>
+			<File
 				RelativePath="..\..\glue\cpp_bound_class_unittest.cc"
 				>
 			</File>
@@ -339,6 +343,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\skia\ext\image_operations_unittest.cc"
+				>
+			</File>
+			<File
 				RelativePath=".\keyboard_unittest.cc"
 				>
 			</File>
-- 
cgit v1.1