webkit/tools/webcore_unit_tests/ICOImageDecoder_unittest.cpp - Issue 280004: Revert wstring patch (r29078 and follow up commits). It is causing failures o...

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 280004: Revert wstring patch (r29078 and follow up commits). It is causing failures o... (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

« no previous file with comments | « webkit/tools/webcore_unit_tests/BMPImageDecoder_unittest.cpp ('k') | webkit/tools/webcore_unit_tests/XBMImageDecoder_unittest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webkit/tools/webcore_unit_tests/ICOImageDecoder_unittest.cpp

===================================================================

--- webkit/tools/webcore_unit_tests/ICOImageDecoder_unittest.cpp (revision 29084)

+++ webkit/tools/webcore_unit_tests/ICOImageDecoder_unittest.cpp (working copy)

@@ -37,7 +37,7 @@

class ICOImageDecoderTest : public ImageDecoderTest {

public:

- ICOImageDecoderTest() : ImageDecoderTest("ico") { }

+ ICOImageDecoderTest() : ImageDecoderTest(L"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.

- 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));