Monster FilePath patch!

chrome/test/plugin/plugin_test.cpp

 // Copyright 2008-2009, 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 29 matching lines @@
 #include <windows.h>
 #include <shellapi.h>
 #include <shlobj.h>
 #include <atlbase.h>
 #include <comutil.h>
 
 #include <stdlib.h>
 #include <string.h>
 #include <memory.h>
 
+#include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/registry.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/ui/ui_test.h"
 #include "net/base/net_util.h"
 #include "third_party/npapi/bindings/npapi.h"
 #include "webkit/default_plugin/plugin_impl.h"
 #include "webkit/glue/plugins/plugin_constants_win.h"
@@ skipping 35 matching lines @@
 
   void TestPlugin(const std::wstring& test_case, int timeout) {
     GURL url = GetTestUrl(test_case);
     NavigateToURL(url);
     WaitForFinish(timeout);
   }
 
   // Generate the URL for testing a particular test.
   // HTML for the tests is all located in test_directory\plugin\<testcase>
   GURL GetTestUrl(const std::wstring &test_case) {
-    std::wstring path;
+    FilePath path;
     PathService::Get(chrome::DIR_TEST_DATA, &path);
-    file_util::AppendToPath(&path, L"plugin");
-    file_util::AppendToPath(&path, test_case);
+    path = path.AppendASCII("plugin");
+    path = path.Append(FilePath::FromWStringHack(test_case));
     return net::FilePathToFileURL(path);
   }
 
   // Waits for the test case to finish.
   void WaitForFinish(const int wait_time) {
     const int kSleepTime = 500;      // 2 times per second
     const int kMaxIntervals = wait_time / kSleepTime;
 
     GURL url = GetTestUrl(L"done");
     scoped_ptr<TabProxy> tab(GetActiveTab());
@@ skipping 179 matching lines @@
       activex_codebase,
       "http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab");
 
   EXPECT_EQ(activex_clsid, "{D27CDB6E-AE6D-11cf-96B8-444553540000}");
   EXPECT_EQ(raw_activex_clsid, "D27CDB6E-AE6D-11cf-96B8-444553540000");
 
   EXPECT_EQ(
       activex_codebase,
       "http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab");
 }