Refactor BrowsingDataRemover creation for clarity.

chrome/browser/webdata/autofill_table.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/webdata/autofill_table.h"
 
 #include <algorithm>
 #include <limits>
 #include <map>
 #include <set>
@@ skipping 387 matching lines @@
     std::vector<AutofillChange>* changes) {
   DCHECK(changes);
   // Query for the pair_id, name, and value of all form elements that
   // were used between the given times.
   sql::Statement s(db_->GetUniqueStatement(
       "SELECT DISTINCT a.pair_id, a.name, a.value "
       "FROM autofill_dates ad JOIN autofill a ON ad.pair_id = a.pair_id "
       "WHERE ad.date_created >= ? AND ad.date_created < ?"));
   s.BindInt64(0, delete_begin.ToTimeT());
   s.BindInt64(1,
-              delete_end.is_null() ?
+              (delete_end.is_null() || delete_end == base::Time::Max()) ?
                   std::numeric_limits<int64>::max() :
                   delete_end.ToTimeT());
 
   AutofillElementList elements;
   while (s.Step()) {
     elements.push_back(MakeTuple(s.ColumnInt64(0),
                                  s.ColumnString16(1),
                                  s.ColumnString16(2)));
   }
   if (!s.Succeeded())
@@ skipping 718 matching lines @@
 }
 
 bool AutofillTable::RemoveAutofillProfilesAndCreditCardsModifiedBetween(
     const Time& delete_begin,
     const Time& delete_end,
     std::vector<std::string>* profile_guids,
     std::vector<std::string>* credit_card_guids) {
   DCHECK(delete_end.is_null() || delete_begin < delete_end);
 
   time_t delete_begin_t = delete_begin.ToTimeT();
-  time_t delete_end_t = delete_end.is_null() ?
-      std::numeric_limits<time_t>::max() :
-      delete_end.ToTimeT();
+  time_t delete_end_t =
+      (delete_end.is_null() || delete_end == base::Time::Max()) ?
+          std::numeric_limits<time_t>::max() : delete_end.ToTimeT();
 
   // Remember Autofill profiles in the time range.
   sql::Statement s_profiles_get(db_->GetUniqueStatement(
       "SELECT guid FROM autofill_profiles "
       "WHERE date_modified >= ? AND date_modified < ?"));
   s_profiles_get.BindInt64(0, delete_begin_t);
   s_profiles_get.BindInt64(1, delete_end_t);
 
   profile_guids->clear();
   while (s_profiles_get.Step()) {
@@ skipping 818 matching lines @@
         "WHERE guid=?"));
     s_date.BindInt64(0, date_item->second);
     s_date.BindString(1, iter->guid());
 
     if (!s_date.Run())
       return false;
   }
 
   return true;
 }