Index: chrome/browser/history/text_database.cc |
diff --git a/chrome/browser/history/text_database.cc b/chrome/browser/history/text_database.cc |
index bb70fc75f8e7e0996fcebf26b0e7069af5b51d43..c5da03cf2cad466c5d51728e5e88c3bbccde0c75 100644 |
--- a/chrome/browser/history/text_database.cc |
+++ b/chrome/browser/history/text_database.cc |
@@ -111,9 +111,14 @@ TextDatabase::DBIdent TextDatabase::FileNameToID(const FilePath& file_path) { |
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; |
} |