Remove more wstrings in webkit/tools/test_shell.

webkit/tools/test_shell/image_decoder_unittest.cc

 // Copyright (c) 2011 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 "base/file_path.h"
 #include "base/file_util.h"
 #include "base/md5.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 32 matching lines @@
   memcpy(&contents->at(0), raw_image_data.data(), raw_image_data.size());
 }
 
 FilePath GetMD5SumPath(const FilePath& path) {
   static const FilePath::StringType kDecodedDataExtension(
       FILE_PATH_LITERAL(".md5sum"));
   return FilePath(path.value() + kDecodedDataExtension);
 }
 
 #if defined(CALCULATE_MD5_SUMS)
-void SaveMD5Sum(const std::wstring& path, const WebKit::WebImage& web_image) {
+void SaveMD5Sum(const FilePath& path, const WebKit::WebImage& web_image) {
   // Calculate MD5 sum.
   base::MD5Digest digest;
   web_image.getSkBitmap().lockPixels();
   base::MD5Sum(web_image.getSkBitmap().getPixels(),
          web_image.getSkBitmap().width() * web_image.getSkBitmap().height() *
          sizeof(uint32_t),
          &digest);
 
   // Write sum to disk.
   int bytes_written = file_util::WriteFile(path,
@@ skipping 138 matching lines @@
   }
 
   EXPECT_FALSE(decoder->isFailed()) << image_path.value();
 
 #ifdef CALCULATE_MD5_SUMS
   // 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.value(), image);
+  SaveMD5Sum(md5_sum_path, image);
 #else
   VerifyImage(*decoder, image_path, md5_sum_path, desired_frame_index);
 #endif
 }