Port some things in browser/{download,history}, minor things in common....

chrome/browser/history/text_database.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 <limits>
 #include <set>
 
 #include "chrome/browser/history/text_database.h"
 
 #include "base/file_util.h"
@@ skipping 97 matching lines @@
   return StringPrintf(L"%ls%d-%02d", file_base(), id / 100, id % 100);
 }
 
 // static
 TextDatabase::DBIdent TextDatabase::FileNameToID(const std::wstring& file_path){
   std::wstring file_name = file_util::GetFilenameFromPath(file_path);
 
   // We don't actually check the prefix here. Since the file system could
   // be case insensitive in ways we can't predict (NTFS), checking could
   // potentially be the wrong thing to do. Instead, we just look for a suffix.
-  static const int kIDStringLength = 7;  // Room for "xxxx-xx".
+  static const size_t kIDStringLength = 7;  // Room for "xxxx-xx".
   if (file_name.length() < kIDStringLength)
     return 0;
-  const wchar_t* number_begin =
-      &file_name[file_name.length() - kIDStringLength];
+  const std::wstring suffix(&file_name[file_name.length() - kIDStringLength]);
 
-  int year, month;
-  if (swscanf_s(number_begin, L"%d-%d", &year, &month) != 2)
-    return 0;  // Unable to get both numbers.
+  if (suffix.length() != kIDStringLength || suffix[4] != L'-') {
+    return 0;
+  }
+
+  int year = StringToInt(suffix.substr(0, 4));
+  int month = StringToInt(suffix.substr(5, 2));
 
   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 204 matching lines @@
       URLSet::const_iterator found_url = found_urls->find(url);
       if (found_url != found_urls->end())
         continue;  // Don't add this duplicate when unique URLs are requested.
     }
 
     // Fill the results into the vector (avoid copying the URL with Swap()).
     results->resize(results->size() + 1);
     Match& match = results->at(results->size() - 1);
     match.url.Swap(&url);
 
-    match.title = statement->column_string16(1);
+    match.title = UTF8ToWide(statement->column_string(1));
     match.time = Time::FromInternalValue(statement->column_int64(2));
 
     // Extract any matches in the title.
     std::string offsets_str = statement->column_string(3);
     Snippet::ExtractMatchPositions(offsets_str, kTitleColumnIndex,
                                    &match.title_match_positions);
     Snippet::ConvertMatchPositionsToWide(statement->column_string(1),
                                          &match.title_match_positions);
 
     // Extract the matches in the body.
@@ skipping 17 matching lines @@
     // 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