Move image decoder unit tests to content_unittests

content/renderer/ico_image_decoder_unittest.cc

Index: content/renderer/ico_image_decoder_unittest.cc
diff --git a/webkit/tools/webcore_unit_tests/ICOImageDecoder_unittest.cpp b/content/renderer/ico_image_decoder_unittest.cc
similarity index 87%
rename from webkit/tools/webcore_unit_tests/ICOImageDecoder_unittest.cpp
rename to content/renderer/ico_image_decoder_unittest.cc
index dd6470294755d7067e0891e76a3d188b85820b88..3b02874772a7a0c4f8992f19ec4a6a38a221a5bc 100644
--- a/webkit/tools/webcore_unit_tests/ICOImageDecoder_unittest.cpp
+++ b/content/renderer/ico_image_decoder_unittest.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/files/file_path.h"
 #include "base/file_util.h"
+#include "base/files/file_path.h"
+#include "content/test/image_decoder_test.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebImageDecoder.h"
-#include "webkit/tools/test_shell/image_decoder_unittest.h"
 
 using WebKit::WebImageDecoder;
 
@@ -14,7 +14,7 @@ class ICOImageDecoderTest : public ImageDecoderTest {
   ICOImageDecoderTest() : ImageDecoderTest("ico") { }
 
  protected:
-   virtual WebKit::WebImageDecoder* CreateWebKitImageDecoder() const OVERRIDE {
+  virtual WebKit::WebImageDecoder* CreateWebKitImageDecoder() const OVERRIDE {
      return new WebKit::WebImageDecoder(WebKit::WebImageDecoder::TypeICO);
   }
 };
@@ -24,6 +24,8 @@ TEST_F(ICOImageDecoderTest, Decoding) {
 }
 
 TEST_F(ICOImageDecoderTest, ImageNonZeroFrameIndex) {
+  if (data_dir_.empty())
+    return;
   // Test that the decoder decodes multiple sizes of icons which have them.
   // Load an icon that has both favicon-size and larger entries.
   base::FilePath multisize_icon_path(data_dir_.AppendASCII("yahoo.ico"));