| Index: chrome/test/ui/omnibox_uitest.cc
|
| ===================================================================
|
| --- chrome/test/ui/omnibox_uitest.cc (revision 25594)
|
| +++ chrome/test/ui/omnibox_uitest.cc (working copy)
|
| @@ -136,12 +136,12 @@
|
| if (!CommandLine::ForCurrentProcess()->HasSwitch(kRunOmniboxTest))
|
| return;
|
|
|
| - std::wstring omnibox_tests_path;
|
| + FilePath omnibox_tests_path;
|
| PathService::Get(chrome::DIR_TEST_DATA, &omnibox_tests_path);
|
| - file_util::AppendToPath(&omnibox_tests_path, L"omnibox_tests.xml");
|
| + omnibox_tests_path = omnibox_tests_path.AppendASCII("omnibox_tests.xml");
|
|
|
| XmlReader reader;
|
| - ASSERT_TRUE(reader.LoadFile(WideToASCII(omnibox_tests_path)));
|
| + ASSERT_TRUE(reader.LoadFile(WideToASCII(omnibox_tests_path.ToWStringHack())));
|
| while (reader.SkipToElement()) {
|
| ASSERT_EQ("omnibox_tests", reader.NodeName());
|
| reader.Read();
|
|
|