Revert 117824 - Convert use of int ms to TimeDelta in files owned by brettw.

chrome/browser/history/text_database_manager.cc

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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 "chrome/browser/history/text_database_manager.h"
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/metrics/histogram.h"
 #include "base/logging.h"
@@ skipping 14 matching lines @@
 // The number of database files we will be attached to at once.
 const int kCacheDBSize = 5;
 
 std::string ConvertStringForIndexer(const string16& input) {
   // TODO(evanm): other transformations here?
   return UTF16ToUTF8(CollapseWhitespace(input, false));
 }
 
 // Data older than this will be committed to the full text index even if we
 // haven't gotten a title and/or body.
-const int kExpirationSeconds = 20;
+const int kExpirationSec = 20;
 
 }  // namespace
 
 // TextDatabaseManager::ChangeSet ----------------------------------------------
 
 TextDatabaseManager::ChangeSet::ChangeSet() {}
 
 TextDatabaseManager::ChangeSet::~ChangeSet() {}
 
 // TextDatabaseManager::PageInfo -----------------------------------------------
@@ skipping 17 matching lines @@
 }
 
 void TextDatabaseManager::PageInfo::set_body(const string16& bdy) {
   if (bdy.empty())  // Make the body nonempty when we set it for EverybodySet.
     body_ = ASCIIToUTF16(" ");
   else
     body_ = bdy;
 }
 
 bool TextDatabaseManager::PageInfo::Expired(TimeTicks now) const {
-  return now - added_time_ > base::TimeDelta::FromSeconds(kExpirationSeconds);
+  return now - added_time_ > TimeDelta::FromSeconds(kExpirationSec);
 }
 
 // TextDatabaseManager ---------------------------------------------------------
 
 TextDatabaseManager::TextDatabaseManager(const FilePath& dir,
                                          URLDatabase* url_database,
                                          VisitDatabase* visit_database)
     : dir_(dir),
       url_database_(url_database),
       visit_database_(visit_database),
@@ skipping 116 matching lines @@
     if (!visit_database_->GetMostRecentVisitForURL(url_row.id(), &visit))
       return;  // No recent visit, give up.
 
     if (visit.is_indexed) {
       // If this page was already indexed, we could have a body that came in
       // first and we don't want to overwrite it. We could go query for the
       // current body, or have a special setter for only the title, but this is
       // not worth it for this edge case.
       //
       // It will be almost impossible for the title to take longer than
-      // kExpirationSeconds yet we got a body in less than that time, since
-      // the title should always come in first.
+      // kExpirationSec yet we got a body in less than that time, since the
+      // title should always come in first.
       return;
     }
 
     AddPageData(url, url_row.id(), visit.visit_id, visit.visit_time,
                 title, string16());
     return;  // We don't know about this page, give up.
   }
 
   PageInfo& info = found->second;
   if (info.has_body()) {
     // This info is complete, write to the database.
     AddPageData(url, info.url_id(), info.visit_id(), info.visit_time(),
                 title, info.body());
     recent_changes_.Erase(found);
     return;
   }
 
   info.set_title(title);
 }
 
 void TextDatabaseManager::AddPageContents(const GURL& url,
                                           const string16& body) {
   RecentChangeList::iterator found = recent_changes_.Peek(url);
   if (found == recent_changes_.end()) {
     // This page is not in our cache of recent pages. This means that the page
-    // took more than kExpirationSeconds to load. Often, this will be the result
-    // of a very slow iframe or other resource on the page that makes us think
-    // its still loading.
+    // took more than kExpirationSec to load. Often, this will be the result of
+    // a very slow iframe or other resource on the page that makes us think its
+    // still loading.
     //
     // As a fallback, set the most recent visit's contents using the input, and
     // use the last set title in the URL table as the title to index.
     URLRow url_row;
     if (!url_database_->GetRowForURL(url, &url_row))
       return;  // URL is unknown, give up.
     VisitRow visit;
     if (!visit_database_->GetMostRecentVisitForURL(url_row.id(), &visit))
       return;  // No recent visit, give up.
 
@@ skipping 280 matching lines @@
                                                 bool create_if_necessary) {
   return GetDB(TimeToID(time), create_if_necessary);
 }
 
 void TextDatabaseManager::ScheduleFlushOldChanges() {
   weak_factory_.InvalidateWeakPtrs();
   MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&TextDatabaseManager::FlushOldChanges,
                  weak_factory_.GetWeakPtr()),
-      base::TimeDelta::FromSeconds(kExpirationSeconds));
+      kExpirationSec * Time::kMillisecondsPerSecond);
 }
 
 void TextDatabaseManager::FlushOldChanges() {
   FlushOldChangesForTime(TimeTicks::Now());
 }
 
 void TextDatabaseManager::FlushOldChangesForTime(TimeTicks now) {
   // The end of the list is the oldest, so we just start from there committing
   // things until we get something too new.
   RecentChangeList::reverse_iterator i = recent_changes_.rbegin();
   while (i != recent_changes_.rend() && i->second.Expired(now)) {
     AddPageData(i->first, i->second.url_id(), i->second.visit_id(),
                 i->second.visit_time(), i->second.title(), i->second.body());
     i = recent_changes_.Erase(i);
   }
 
   ScheduleFlushOldChanges();
 }
 
 }  // namespace history