summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-09 20:00:13 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-09 20:00:13 +0000
commitef5ff1b40f1024d834620f5cede62dfd4aea6e0c (patch)
tree3935dae6b7f1ab45c01bc8f66d6bfee7338d9a9a /chrome/common
parent0bbb1b1f9842366babce756ab2f1713832be63de (diff)
downloadchromium_src-ef5ff1b40f1024d834620f5cede62dfd4aea6e0c.zip
chromium_src-ef5ff1b40f1024d834620f5cede62dfd4aea6e0c.tar.gz
chromium_src-ef5ff1b40f1024d834620f5cede62dfd4aea6e0c.tar.bz2
Fix to use FilePath version of PathService::Get.
BUG=None TEST=None Original Review URL: http://codereview.chromium.org/174189 Patch from Thiago Farina <thiago.farina@gmail.com>. Review URL: http://codereview.chromium.org/193047 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25778 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r--chrome/common/json_value_serializer_perftest.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/common/json_value_serializer_perftest.cc b/chrome/common/json_value_serializer_perftest.cc
index c54ad67..0032260 100644
--- a/chrome/common/json_value_serializer_perftest.cc
+++ b/chrome/common/json_value_serializer_perftest.cc
@@ -18,17 +18,17 @@ namespace {
class JSONValueSerializerTests : public testing::Test {
protected:
virtual void SetUp() {
- static const wchar_t* const kTestFilenames[] = {
- L"serializer_nested_test.js",
- L"serializer_test.js",
- L"serializer_test_nowhitespace.js",
+ static const char* const kTestFilenames[] = {
+ "serializer_nested_test.js",
+ "serializer_test.js",
+ "serializer_test_nowhitespace.js",
};
// Load test cases
for (size_t i = 0; i < arraysize(kTestFilenames); ++i) {
- std::wstring filename;
+ FilePath filename;
EXPECT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &filename));
- file_util::AppendToPath(&filename, kTestFilenames[i]);
+ filename = filename.AppendASCII(kTestFilenames[i]);
std::string test_case;
EXPECT_TRUE(file_util::ReadFileToString(filename, &test_case));