Move GetFileSize, NormalizeFilePath to base namespace

chrome/browser/history/thumbnail_database.cc

 // Copyright (c) 2012 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 "chrome/browser/history/thumbnail_database.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 434 matching lines @@
   DCHECK_EQ(7, kCurrentVersionNumber);
 
   // TODO(shess): Reset back after?
   db->reset_error_callback();
 
   // For histogram purposes.
   size_t favicons_rows_recovered = 0;
   size_t favicon_bitmaps_rows_recovered = 0;
   size_t icon_mapping_rows_recovered = 0;
   int64 original_size = 0;
-  file_util::GetFileSize(db_path, &original_size);
+  base::GetFileSize(db_path, &original_size);
 
   scoped_ptr<sql::Recovery> recovery = sql::Recovery::Begin(db, db_path);
   if (!recovery) {
     // TODO(shess): Unable to create recovery connection.  This
     // implies something substantial is wrong.  At this point |db| has
     // been poisoned so there is nothing really to do.
     //
     // Possible responses are unclear.  If the failure relates to a
     // problem somehow specific to the temporary file used to back the
     // database, then an in-memory database could possibly be used.
@@ skipping 51 matching lines @@
 
     // TODO(shess): Could this code be shared with the v6/7 code
     // without requiring too much state to be carried?
 
     // Track the size of the recovered database relative to the size of
     // the input database.  The size should almost always be smaller,
     // unless the input database was empty to start with.  If the
     // percentage results are very low, something is awry.
     int64 final_size = 0;
     if (original_size > 0 &&
-        file_util::GetFileSize(db_path, &final_size) &&
+        base::GetFileSize(db_path, &final_size) &&
         final_size > 0) {
       int percentage = static_cast<int>(original_size * 100 / final_size);
       UMA_HISTOGRAM_PERCENTAGE("History.FaviconsRecoveredPercentage",
                                std::max(100, percentage));
     }
 
     // Using 10,000 because these cases mostly care about "none
     // recovered" and "lots recovered".  More than 10,000 rows recovered
     // probably means there's something wrong with the profile.
     UMA_HISTOGRAM_COUNTS_10000("History.FaviconsRecoveredRowsFavicons",
@@ skipping 82 matching lines @@
     RecordRecoveryEvent(RECOVERY_EVENT_FAILED_COMMIT);
     return;
   }
 
   // Track the size of the recovered database relative to the size of
   // the input database.  The size should almost always be smaller,
   // unless the input database was empty to start with.  If the
   // percentage results are very low, something is awry.
   int64 final_size = 0;
   if (original_size > 0 &&
-      file_util::GetFileSize(db_path, &final_size) &&
+      base::GetFileSize(db_path, &final_size) &&
       final_size > 0) {
     int percentage = static_cast<int>(original_size * 100 / final_size);
     UMA_HISTOGRAM_PERCENTAGE("History.FaviconsRecoveredPercentage",
                              std::max(100, percentage));
   }
 
   // Using 10,000 because these cases mostly care about "none
   // recovered" and "lots recovered".  More than 10,000 rows recovered
   // probably means there's something wrong with the profile.
   UMA_HISTOGRAM_COUNTS_10000("History.FaviconsRecoveredRowsFavicons",
@@ skipping 593 matching lines @@
   if (!db_.Execute(kIconMappingDrop))
     return false;
 
   return transaction.Commit();
 }
 
 sql::InitStatus ThumbnailDatabase::OpenDatabase(sql::Connection* db,
                                                 const base::FilePath& db_name) {
   size_t startup_kb = 0;
   int64 size_64;
-  if (file_util::GetFileSize(db_name, &size_64))
+  if (base::GetFileSize(db_name, &size_64))
     startup_kb = static_cast<size_t>(size_64 / 1024);
 
   db->set_histogram_tag("Thumbnail");
   db->set_error_callback(base::Bind(&DatabaseErrorCallback,
                                     db, db_name, startup_kb));
 
   // Thumbnails db now only stores favicons, so we don't need that big a page
   // size or cache.
   db->set_page_size(2048);
   db->set_cache_size(32);
@@ skipping 172 matching lines @@
   meta_table_.SetVersionNumber(7);
   meta_table_.SetCompatibleVersionNumber(std::min(7, kCompatibleVersionNumber));
   return true;
 }
 
 bool ThumbnailDatabase::IsFaviconDBStructureIncorrect() {
   return !db_.IsSQLValid("SELECT id, url, icon_type FROM favicons");
 }
 
 }  // namespace history