Monster FilePath patch!

chrome/test/tab_switching/tab_switching_test.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
@@ skipping 90 matching lines @@
     // Print the average and standard deviation.
     PrintResultMeanAndError("tab_switch", "", "t",
                             average + ", " + std_dev, "ms",
                             true /* important */);
   }
 
  protected:
   // Opens new tabs. Returns the number of tabs opened.
   int OpenTabs() {
     // Add tabs.
-    static const wchar_t* files[] = { L"espn.go.com", L"bugzilla.mozilla.org",
-                                      L"news.cnet.com", L"www.amazon.com",
-                                      L"kannada.chakradeo.net", L"allegro.pl",
-                                      L"ml.wikipedia.org", L"www.bbc.co.uk",
-                                      L"126.com", L"www.altavista.com"};
+    static const char* files[] = { "espn.go.com", "bugzilla.mozilla.org",
+                                   "news.cnet.com", "www.amazon.com",
+                                   "kannada.chakradeo.net", "allegro.pl",
+                                   "ml.wikipedia.org", "www.bbc.co.uk",
+                                   "126.com", "www.altavista.com"};
     int number_of_new_tabs_opened = 0;
-    std::wstring file_name;
+    FilePath file_name;
     for (int i = 0; i < arraysize(files); ++i) {
-      file_name = path_prefix_;
-      file_name += files[i];
-      file_name += FilePath::kSeparators[0];
-      file_name += L"index.html";
+      file_name = FilePath::FromWStringHack(path_prefix_);
+      file_name = file_name.AppendASCII(files[i]);
+      file_name = file_name.AppendASCII("index.html");
       browser_proxy_->AppendTab(net::FilePathToFileURL(file_name));
       number_of_new_tabs_opened++;
     }
 
     return number_of_new_tabs_opened;
   }
 
   std::wstring path_prefix_;
   int number_of_tabs_to_open_;
   scoped_ptr<BrowserProxy> browser_proxy_;
 
  private:
   DISALLOW_EVIL_CONSTRUCTORS(TabSwitchingUITest);
 };
 
 }  // namespace
 
 TEST_F(TabSwitchingUITest, GenerateTabSwitchStats) {
   RunTabSwitchingUITest();
 }