Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(28)

Unified Diff: webkit/tools/webcore_unit_tests/ICOImageDecoder_unittest.cpp

Issue 271099: Re-try r29078: Remove some deprecated file_util wstring functions. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webkit/tools/webcore_unit_tests/ICOImageDecoder_unittest.cpp
===================================================================
--- webkit/tools/webcore_unit_tests/ICOImageDecoder_unittest.cpp (revision 29088)
+++ webkit/tools/webcore_unit_tests/ICOImageDecoder_unittest.cpp (working copy)
@@ -37,7 +37,7 @@
class ICOImageDecoderTest : public ImageDecoderTest {
public:
- ICOImageDecoderTest() : ImageDecoderTest(L"ico") { }
+ ICOImageDecoderTest() : ImageDecoderTest("ico") { }
protected:
virtual WebCore::ImageDecoder* CreateDecoder() const {
@@ -59,13 +59,13 @@
// Test that the decoder decodes multiple sizes of icons which have them.
// Load an icon that has both favicon-size and larger entries.
- std::wstring multisize_icon_path(data_dir_);
- file_util::AppendToPath(&multisize_icon_path, L"yahoo.ico");
+ FilePath multisize_icon_path(data_dir_.AppendASCII("yahoo.ico"));
scoped_ptr<WebCore::ImageDecoder> decoder(SetupDecoder(multisize_icon_path,
false));
// Verify the decoding.
- const std::wstring md5_sum_path(GetMD5SumPath(multisize_icon_path) + L"2");
+ const FilePath md5_sum_path(
+ GetMD5SumPath(multisize_icon_path).value() + FILE_PATH_LITERAL("2"));
static const int kDesiredFrameIndex = 3;
#ifdef CALCULATE_MD5_SUMS
SaveMD5Sum(md5_sum_path, decoder->frameBufferAtIndex(kDesiredFrameIndex));

Powered by Google App Engine
This is Rietveld 408576698