1 files changed, 9 insertions, 2 deletions
diff --git a/skia/ext/vector_canvas_unittest.cc b/skia/ext/vector_canvas_unittest.cc
index 11c6f41..328de22 100644
--- a/skia/ext/vector_canvas_unittest.cc
+++ b/skia/ext/vector_canvas_unittest.cc
@@ -5,14 +5,14 @@
 #include "config.h"
 #include "build/build_config.h"
 
-#include "webkit/tools/test_shell/image_decoder_unittest.h"
-
 #if !defined(OS_WIN)
 #include <unistd.h>
 #endif
 
 #include "PNGImageDecoder.h"
 
+#undef LOG
+
 #include "app/gfx/codec/png_codec.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
@@ -28,6 +28,13 @@ namespace {
 
 const wchar_t* const kGenerateSwitch = L"vector-canvas-generate";
 
+void ReadFileToVector(const FilePath& path, Vector<char>* contents) {
+  std::string contents_str;
+  file_util::ReadFileToString(path, &contents_str);
+  contents->resize(contents_str.size());
+  memcpy(&contents->first(), contents_str.data(), contents_str.size());
+}
+
 // Lightweight HDC management.
 class Context {
  public: