Get rid of wstring variants of StringToFoo.

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 109 matching lines @@
   // potentially be the wrong thing to do. Instead, we just look for a suffix.
   static const size_t kIDStringLength = 7;  // Room for "xxxx-xx".
   if (file_name.length() < kIDStringLength)
     return 0;
   const std::wstring suffix(&file_name[file_name.length() - kIDStringLength]);
 
   if (suffix.length() != kIDStringLength || suffix[4] != L'-') {
     return 0;
   }
 
-  int year = StringToInt(suffix.substr(0, 4));
-  int month = StringToInt(suffix.substr(5, 2));
+  int year = StringToInt(WideToUTF16Hack(suffix.substr(0, 4)));
+  int month = StringToInt(WideToUTF16Hack(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 243 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
-