Update code that previously constructed strings from string iterators only to...

chrome/test/page_cycler/page_cycler_test.cc

 // Copyright (c) 2010 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/basictypes.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
@@ skipping 130 matching lines @@
       }
       if (should_skip)
         continue;
 
       // Read the file fully to get it into the cache.
       // We don't care what the contents are.
       if (file_util::ReadFileToString(path, NULL))
         ++loaded;
     }
   }
   VLOG(1) << "Buffer cache should be primed with " << loaded << " files.";

[erikwright (departed), 2010/10/22 13:50:23]

Unrelated change in Trunk.

 }
 
 class PageCyclerTest : public UIPerfTest {
  protected:
   bool print_times_only_;
   int num_test_iterations_;
 #if defined(OS_MACOSX)
   rlim_t fd_limit_;
 #endif
  public:
@@ skipping 197 matching lines @@
 
 static bool HasDatabaseErrors(const std::string timings) {
   size_t pos = 0;
   size_t new_pos = 0;
   std::string time_str;
   int time = 0;
   do {
     new_pos = timings.find(',', pos);
     if (new_pos == std::string::npos)
       new_pos = timings.length();
-    time_str = timings.substr(pos, new_pos - pos);
-    if (!base::StringToInt(time_str, &time)) {
+    if (!base::StringToInt(timings.begin() + pos,
+                           timings.begin() + new_pos,
+                           &time)) {
       LOG(ERROR) << "Invalid time reported: " << time_str;
       return true;
     }
     if (time < 0) {
       switch (time) {
         case -1:
           LOG(ERROR) << "Error while opening the database.";
           break;
         case -2:
           LOG(ERROR) << "Error while setting up the database.";
@@ skipping 122 matching lines @@
                            InsertTransactions);
 PAGE_CYCLER_DATABASE_TESTS("update-transactions",
                            UpdateTransactions);
 PAGE_CYCLER_DATABASE_TESTS("delete-transactions",
                            DeleteTransactions);
 PAGE_CYCLER_DATABASE_TESTS("pseudo-random-transactions",
                            PseudoRandomTransactions);
 #endif
 
 }  // namespace