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

webkit/tools/webcore_unit_tests/BMPImageDecoder_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 16 matching lines @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "config.h"
 #include "webkit/tools/test_shell/image_decoder_unittest.h"
 
 #include "BMPImageDecoder.h"
 
 class BMPImageDecoderTest : public ImageDecoderTest {
  public:
-  BMPImageDecoderTest() : ImageDecoderTest("bmp") { }
+  BMPImageDecoderTest() : ImageDecoderTest(L"bmp") { }
 
  protected:
   virtual WebCore::ImageDecoder* CreateDecoder() const {
     return new WebCore::BMPImageDecoder();
   }
 
   // The BMPImageDecoderTest tests are really slow under Valgrind.
   // Thus it is split into fast and slow versions. The threshold is
   // set to 10KB because the fast test can finish under Valgrind in
   // less than 30 seconds.
@@ skipping 10 matching lines @@
 
 #ifndef CALCULATE_MD5_SUMS
 TEST_F(BMPImageDecoderTest, ChunkedDecodingFast) {
   TestChunkedDecoding(TEST_SMALLER, kThresholdSize);
 }
 
 TEST_F(BMPImageDecoderTest, ChunkedDecodingSlow) {
   TestChunkedDecoding(TEST_BIGGER, kThresholdSize);
 }
 #endif