Monster FilePath patch!

chrome/test/ui/layout_plugin_uitest.cc

 // Copyright 2008, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //    * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
 //    * Redistributions in binary form must reproduce the above
@@ skipping 39 matching lines @@
   std::wstring plugins_directory = browser_directory_;
   plugins_directory += L"\\plugins";
   std::wstring plugin_src = browser_directory_;
   plugin_src += L"\\npapi_layout_test_plugin.dll";
   std::wstring plugin_dest = plugins_directory;
   plugin_dest += L"\\npapi_layout_test_plugin.dll";
 
   CreateDirectory(plugins_directory.c_str(), NULL);
   CopyFile(plugin_src.c_str(), plugin_dest.c_str(), true /* overwrite */);
 
-  std::wstring path;
+  FilePath path;
   PathService::Get(chrome::DIR_TEST_DATA, &path);
-  file_util::AppendToPath(&path, L"npapi/layout_test_plugin.html");
+  path = path.AppendASCII("npapi").AppendASCII("layout_test_plugin.html");
   NavigateToURL(net::FilePathToFileURL(path));
 
   std::wstring title;
   TabProxy* tab = GetActiveTab();
   ASSERT_TRUE(tab);
   EXPECT_TRUE(tab->GetTabTitle(&title));
   EXPECT_EQ(L"Layout Test Plugin Test", title);
 
   ASSERT_TRUE(tab->GoBack());
   EXPECT_TRUE(tab->GetTabTitle(&title));
   EXPECT_EQ(L"", title);
 
   delete tab;
 }