Move image decoder unit tests to content_unittests

content/test/image_decoder_test.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/tools/test_shell/image_decoder_unittest.h"
+#include "content/test/image_decoder_test.h"
 
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/md5.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebData.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebImage.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h"
@@ skipping 85 matching lines @@
   web_image.getSkBitmap().unlockPixels();
 }
 #endif
 
 void ImageDecoderTest::SetUp() {
   base::FilePath data_dir;
   ASSERT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &data_dir));
   data_dir_ = data_dir.AppendASCII("webkit").
                        AppendASCII("data").
                        AppendASCII(format_ + "_decoder");
-  ASSERT_TRUE(file_util::PathExists(data_dir_)) << data_dir_.value();
+  if (!file_util::PathExists(data_dir_)) {
+    const testing::TestInfo* const test_info =
+        testing::UnitTest::GetInstance()->current_test_info();
+    LOG(INFO) << test_info->name() <<
+                 " not running because test data wasn't found.";
+    data_dir_.clear();
+    return;
+  }
 }
 
 std::vector<base::FilePath> ImageDecoderTest::GetImageFiles() const {
   std::string pattern = "*." + format_;
 
   file_util::FileEnumerator enumerator(data_dir_,
                                        false,
                                        file_util::FileEnumerator::FILES);
 
   std::vector<base::FilePath> image_files;
   base::FilePath next_file_name;
   while (!(next_file_name = enumerator.Next()).empty()) {
     base::FilePath base_name = next_file_name.BaseName();
 #if defined(OS_WIN)
     std::string base_name_ascii = WideToASCII(base_name.value());
 #else
     std::string base_name_ascii = base_name.value();
 #endif
     if (!MatchPattern(base_name_ascii, pattern))
       continue;
     image_files.push_back(next_file_name);
   }
 
   return image_files;
 }
 
 bool ImageDecoderTest::ShouldImageFail(const base::FilePath& path) const {
-  static const base::FilePath::StringType kBadSuffix(FILE_PATH_LITERAL(".bad."));
+  const base::FilePath::StringType kBadSuffix(FILE_PATH_LITERAL(".bad."));
   return (path.value().length() > (kBadSuffix.length() + format_.length()) &&
           !path.value().compare(path.value().length() - format_.length() -
                                     kBadSuffix.length(),
                                 kBadSuffix.length(), kBadSuffix));
 }
 
 void ImageDecoderTest::TestDecoding(
     ImageDecoderTestFileSelection file_selection,
     const int64 threshold) {
+  if (data_dir_.empty())
+    return;
   const std::vector<base::FilePath> image_files(GetImageFiles());
   for (std::vector<base::FilePath>::const_iterator i = image_files.begin();
        i != image_files.end(); ++i) {
     if (ShouldSkipFile(*i, file_selection, threshold))
       continue;
     const base::FilePath md5_sum_path(GetMD5SumPath(*i));
     TestWebKitImageDecoder(*i, md5_sum_path, kFirstFrameIndex);
   }
 }
 
@@ skipping 48 matching lines @@
   // Since WebImage does not expose get data by frame, get the size
   // through decoder and pass it to fromData so that the closest
   // image dats to the size is returned.
   WebKit::WebSize size(decoder->getImage(desired_frame_index).size());
   const WebKit::WebImage& image = WebKit::WebImage::fromData(data, size);
   SaveMD5Sum(md5_sum_path, image);
 #else
   VerifyImage(*decoder, image_path, md5_sum_path, desired_frame_index);
 #endif
 }