Get rid of kPathSeparator on windows.

chrome/browser/visitedlink_perftest.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 <algorithm>
 #include <string>
 #include <vector>
 
 #include "base/file_util.h"
 #include "base/perftimer.h"
@@ skipping 16 matching lines @@
 // Returns a URL with the given prefix and index
 GURL TestURL(const char* prefix, int i) {
   return GURL(StringPrintf("%s%d", prefix, i));
 }
 
 // we have no slaves, so this broadcase is a NOP
 VisitedLinkMaster::PostNewTableEvent DummyBroadcastNewTableEvent;
 void DummyBroadcastNewTableEvent(base::SharedMemory *table) {
 }
 
-// Call at the beginning of the test to retrieve the database name and to
-// delete any old databases left by previous unit tests. The input buffer
-// should be MAX_PATH long.
-void InitDBName(wchar_t* db_name) {
-  ASSERT_TRUE(GetCurrentDirectory(MAX_PATH, db_name));
-  if (db_name[wcslen(db_name) - 1] != file_util::kPathSeparator)
-    wcsncat_s(db_name, MAX_PATH, &file_util::kPathSeparator, 1);
-  wcscat_s(db_name, MAX_PATH, L"TempVisitedLinks");
+// Call at the beginning of the test to retrieve the database name.
+void InitDBName(std::wstring* db_name) {
+  FilePath db_path;
+  ASSERT_TRUE(file_util::GetCurrentDirectory(&db_path));
+  db_path = db_path.Append(FILE_PATH_LITERAL("TempVisitedLinks"));
+  *db_name = db_path.ToWStringHack();
 }
 
 // this checks IsVisited for the URLs starting with the given prefix and
 // within the given range
 void CheckVisited(VisitedLinkMaster& master, const char* prefix,
                   int begin, int end) {
   for (int i = begin; i < end; i++)
     master.IsVisited(TestURL(prefix, i));
 }
 
 // Fills that master's table with URLs starting with the given prefix and
 // within the given range
 void FillTable(VisitedLinkMaster& master, const char* prefix,
                int begin, int end) {
   for (int i = begin; i < end; i++)
     master.AddURL(TestURL(prefix, i));
 }
 
 class VisitedLink : public testing::Test {
  protected:
-  wchar_t db_name_[MAX_PATH];
+  std::wstring db_name_;
   virtual void SetUp() {
-    InitDBName(db_name_);
-    DeleteFile(db_name_);
+    InitDBName(&db_name_);
+    file_util::Delete(db_name_, false);
   }
   virtual void TearDown() {
-    DeleteFile(db_name_);
+    file_util::Delete(db_name_, false);
   }
 };
 
 } // namespace
 
 // This test tests adding many things to a database, and how long it takes
 // to query the database with different numbers of things in it. The time
 // is the total time to do all the operations, and as such, it is only
 // useful for a regression test. If there is a regression, it might be
 // useful to make another set of tests to test these things in isolation.
@@ skipping 56 matching lines @@
   }
 
   // test loading the DB back, we do this several times since the flushing is
   // not very reliable.
   const int load_count = 5;
   std::vector<double> cold_load_times;
   std::vector<double> hot_load_times;
   for (int i = 0; i < load_count; i++)
   {
     // make sure the file has to be re-loaded
-    file_util::EvictFileFromSystemCache(db_name_);
+    file_util::EvictFileFromSystemCache(db_name_.c_str());
 
     // cold load (no OS cache, hopefully)
     {
       PerfTimer cold_timer;
 
       VisitedLinkMaster master(NULL, DummyBroadcastNewTableEvent, NULL, true,
                                db_name_, 0);
       bool success = master.Init();
       TimeDelta elapsed = cold_timer.Elapsed();
       ASSERT_TRUE(success);
@@ skipping 25 matching lines @@
   for (int i = 0; i < static_cast<int>(cold_load_times.size()); i++) {
     cold_sum += cold_load_times[i];
     hot_sum += hot_load_times[i];
   }
   LogPerfResult("Visited_link_cold_load_time",
                 cold_sum / cold_load_times.size(), "ms");
   LogPerfResult("Visited_link_hot_load_time",
                 hot_sum / hot_load_times.size(), "ms");
 }