Revert wstring patch (r29078 and follow up commits). It is causing failures o...

webkit/tools/webcore_unit_tests/ICOImageDecoder_unittest.cpp

 // Copyright (c) 2008, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
@@ skipping 19 matching lines @@
 #include "config.h"
 #include "base/file_util.h"
 #include "base/scoped_ptr.h"
 #include "webkit/tools/test_shell/image_decoder_unittest.h"
 
 #include "ICOImageDecoder.h"
 #include "SharedBuffer.h"
 
 class ICOImageDecoderTest : public ImageDecoderTest {
  public:
-  ICOImageDecoderTest() : ImageDecoderTest("ico") { }
+  ICOImageDecoderTest() : ImageDecoderTest(L"ico") { }
 
  protected:
   virtual WebCore::ImageDecoder* CreateDecoder() const {
     return new WebCore::ICOImageDecoder();
   }
 };
 
 TEST_F(ICOImageDecoderTest, Decoding) {
   TestDecoding();
 }
 
 #ifndef CALCULATE_MD5_SUMS
 TEST_F(ICOImageDecoderTest, ChunkedDecoding) {
   TestChunkedDecoding();
 }
 #endif
 
 TEST_F(ICOImageDecoderTest, FaviconSize) {
   // Test that the decoder decodes multiple sizes of icons which have them.
 
   // Load an icon that has both favicon-size and larger entries.
-  FilePath multisize_icon_path(data_dir_.AppendASCII("yahoo.ico"));
+  std::wstring multisize_icon_path(data_dir_);
+  file_util::AppendToPath(&multisize_icon_path, L"yahoo.ico");
   scoped_ptr<WebCore::ImageDecoder> decoder(SetupDecoder(multisize_icon_path,
                                                          false));
 
   // Verify the decoding.
-  const FilePath md5_sum_path(
-      GetMD5SumPath(multisize_icon_path).value() + FILE_PATH_LITERAL("2"));
+  const std::wstring md5_sum_path(GetMD5SumPath(multisize_icon_path) + L"2");
   static const int kDesiredFrameIndex = 3;
 #ifdef CALCULATE_MD5_SUMS
   SaveMD5Sum(md5_sum_path, decoder->frameBufferAtIndex(kDesiredFrameIndex));
 #else
   VerifyImage(decoder.get(), multisize_icon_path, md5_sum_path,
               kDesiredFrameIndex);
 #endif
 }