Standardize StringToInt{,64} interface.

chrome/browser/history/text_database.cc

 // Copyright (c) 2011 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 <limits>
 #include <set>
 #include <string>
 
 #include "chrome/browser/history/text_database.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/string_number_conversions.h"
+#include "base/string_piece.h"

[erikwright (departed), 2011/12/14 19:09:58]

I guess we don't need this include at the moment. I'll add it in when I revisit
with my CL.

 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/diagnostics/sqlite_diagnostics.h"
 #include "sql/statement.h"
 #include "sql/transaction.h"
 
 // There are two tables in each database, one full-text search (FTS) table which
 // indexes the contents and title of the pages. The other is a regular SQLITE
 // table which contains non-indexed information about the page. All columns of
 // a FTS table are indexed using the text search algorithm, which isn't what we
@@ skipping 79 matching lines @@
   if (file_name.length() < kIDStringLength)
     return 0;
   const FilePath::StringType suffix(
       &file_name[file_name.length() - kIDStringLength]);
 
   if (suffix.length() != kIDStringLength ||
       suffix[4] != FILE_PATH_LITERAL('-')) {
     return 0;
   }
 
+  // TODO: Once StringPiece supports a templated interface over the
+  // underlying string type, use it here instead of substr, since that
+  // will avoid needless string copies.  StringPiece cannot be used
+  // right now because FilePath::StringType could use either 8 or 16 bit
+  // characters, depending on the OS.
   int year, month;
-  base::StringToInt(suffix.begin(), suffix.begin() + 4, &year);
-  base::StringToInt(suffix.begin() + 5, suffix.begin() + 7, &month);
+  base::StringToInt(suffix.substr(0, 4), &year);
+  base::StringToInt(suffix.substr(5, 2), &month);
 
   return year * 100 + month;
 }
 
 bool TextDatabase::Init() {
   // Make sure, if we're not allowed to create the file, that it exists.
   if (!allow_create_) {
     if (!file_util::PathExists(file_name_))
       return false;
   }
@@ skipping 248 matching lines @@
   } else {
     // Since we got the results in order, we know the last item is the last
     // time we considered.
     *first_time_searched = results->back().time;
   }
 
   statement.Reset();
 }
 
 }  // namespace history