Update webdata files to take advantage of DLOG(FATAL) in

chrome/browser/webdata/autofill_table.cc

Index: chrome/browser/webdata/autofill_table.cc
diff --git a/chrome/browser/webdata/autofill_table.cc b/chrome/browser/webdata/autofill_table.cc
index 588afbab097c336dd7a7a95cc7690e3116032c37..ddcd222dc76144b153e50df69289cb889c7bd947 100644
--- a/chrome/browser/webdata/autofill_table.cc
+++ b/chrome/browser/webdata/autofill_table.cc
@@ -139,12 +139,11 @@ bool AddAutofillProfileNamesToProfile(sql::Connection* db,
       "SELECT guid, first_name, middle_name, last_name "
       "FROM autofill_profile_names "
       "WHERE guid=?"));
-  if (!s) {
-    NOTREACHED() << "Statement prepare failed";
-    return false;
-  }
   s.BindString(0, profile->guid());
 
+  if (!s.is_valid())
+    return false;
+
   std::vector<string16> first_names;
   std::vector<string16> middle_names;
   std::vector<string16> last_names;
@@ -166,12 +165,11 @@ bool AddAutofillProfileEmailsToProfile(sql::Connection* db,
       "SELECT guid, email "
       "FROM autofill_profile_emails "
       "WHERE guid=?"));
-  if (!s) {
-    NOTREACHED() << "Statement prepare failed";
-    return false;
-  }
   s.BindString(0, profile->guid());
 
+  if (!s.is_valid())
+    return false;
+
   std::vector<string16> emails;
   while (s.Step()) {
     DCHECK_EQ(profile->guid(), s.ColumnString(0));
@@ -187,14 +185,14 @@ bool AddAutofillProfilePhonesToProfile(sql::Connection* db,
       "SELECT guid, type, number "
       "FROM autofill_profile_phones "
       "WHERE guid=? AND type=?"));
-  if (!s) {
-    NOTREACHED() << "Statement prepare failed";
-    return false;
-  }
-  s.BindString(0, profile->guid());
+
   // Value used to be either [(0, phone), (1, fax)] but fax has been removed.
+  s.BindString(0, profile->guid());
   s.BindInt(1, 0);
 
+  if (!s.is_valid())
+    return false;
+
   std::vector<string16> numbers;
   while (s.Step()) {

[Scott Hess - ex-Googler, 2011/12/15 23:02:57]

Step() could return false either because it has reached the end of the results,
or because there was an error fetching the results.  In the error case, numbers
could be empty (if there was corruption accessing an index), or partially-filled
(if there was a corruption reading from the table).  Should these cases be
paying attention to Succeeded() before calling mutating functions?

[Greg Billock, 2011/12/16 17:26:58]

If it returns false we'll exit the loop, right? But if there's an error, it
should return false. So return s.Succeeded() is the correct behavior here.
Setting the value in that case is a bit cheeky. I'll edit around that...

OK, I've changed quite a few locations. Mostly to move is_valid() checks down
below and do Succeeded() checks. Those are more robust and WLOG. There is a
subtle behavior change, in that some of these will then zero out outparams
whereas before they'd leave them untouched. I'm inclined to believe this will be
OK, but do you think we need to examine that more carefully?

     DCHECK_EQ(profile->guid(), s.ColumnString(0));
@@ -221,19 +219,13 @@ bool AddAutofillProfileNames(const AutofillProfile& profile,
       "INSERT INTO autofill_profile_names"
       " (guid, first_name, middle_name, last_name) "
       "VALUES (?,?,?,?)"));
-    if (!s) {
-      NOTREACHED();
-      return false;
-    }
     s.BindString(0, profile.guid());
     s.BindString16(1, first_names[i]);
     s.BindString16(2, middle_names[i]);
     s.BindString16(3, last_names[i]);
 
-    if (!s.Run()) {
-      NOTREACHED();
+    if (!s.Run())
       return false;
-    }
   }
   return true;
 }
@@ -249,18 +241,13 @@ bool AddAutofillProfileEmails(const AutofillProfile& profile,
       "INSERT INTO autofill_profile_emails"
       " (guid, email) "
       "VALUES (?,?)"));
-    if (!s) {
-      NOTREACHED();
-      return false;
-    }
     s.BindString(0, profile.guid());
     s.BindString16(1, emails[i]);
 
-    if (!s.Run()) {
-      NOTREACHED();
+    if (!s.Run())
       return false;
-    }
   }
+
   return true;
 }
 
@@ -275,19 +262,13 @@ bool AddAutofillProfilePhones(const AutofillProfile& profile,
       "INSERT INTO autofill_profile_phones"
       " (guid, type, number) "
       "VALUES (?,?,?)"));
-    if (!s) {
-      NOTREACHED();
-      return false;
-    }
     s.BindString(0, profile.guid());
     // Value used to be either [(0, phone), (1, fax)] but fax has been removed.
     s.BindInt(1, 0);
     s.BindString16(2, numbers[i]);
 
-    if (!s.Run()) {
-      NOTREACHED();
+    if (!s.Run())
       return false;
-    }
   }
 
   return true;
@@ -310,34 +291,22 @@ bool AddAutofillProfilePieces(const AutofillProfile& profile,
 bool RemoveAutofillProfilePieces(const std::string& guid, sql::Connection* db) {
   sql::Statement s1(db->GetUniqueStatement(
       "DELETE FROM autofill_profile_names WHERE guid = ?"));
-  if (!s1) {
-    NOTREACHED() << "Statement prepare failed";
-    return false;
-  }
-
   s1.BindString(0, guid);
+
   if (!s1.Run())
     return false;
 
   sql::Statement s2(db->GetUniqueStatement(
       "DELETE FROM autofill_profile_emails WHERE guid = ?"));
-  if (!s2) {
-    NOTREACHED() << "Statement prepare failed";
-    return false;
-  }
-
   s2.BindString(0, guid);
+
   if (!s2.Run())
     return false;
 
   sql::Statement s3(db->GetUniqueStatement(
       "DELETE FROM autofill_profile_phones WHERE guid = ?"));
-  if (!s3) {
-    NOTREACHED() << "Statement prepare failed";
-    return false;
-  }
-
   s3.BindString(0, guid);
+
   return s3.Run();
 }
 
@@ -387,11 +356,6 @@ bool AutofillTable::GetFormValuesForElementName(const string16& name,
         "WHERE name = ? "
         "ORDER BY count DESC "
         "LIMIT ?"));
-    if (!s) {
-      NOTREACHED() << "Statement prepare failed";
-      return false;
-    }
-
     s.BindString16(0, name);
     s.BindInt(1, limit);
   } else {
@@ -406,11 +370,6 @@ bool AutofillTable::GetFormValuesForElementName(const string16& name,
         "value_lower < ? "
         "ORDER BY count DESC "
         "LIMIT ?"));
-    if (!s) {
-      NOTREACHED() << "Statement prepare failed";
-      return false;
-    }
-
     s.BindString16(0, name);
     s.BindString16(1, prefix_lower);
     s.BindString16(2, next_prefix);
@@ -434,10 +393,6 @@ bool AutofillTable::RemoveFormElementsAddedBetween(
       "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 < ?"));
-  if (!s) {
-    NOTREACHED() << "Statement 1 prepare failed";
-    return false;
-  }
   s.BindInt64(0, delete_begin.ToTimeT());
   s.BindInt64(1,
               delete_end.is_null() ?
@@ -451,10 +406,8 @@ bool AutofillTable::RemoveFormElementsAddedBetween(
                                  s.ColumnString16(2)));
   }
 
-  if (!s.Succeeded()) {
-    NOTREACHED();
+  if (!s.Succeeded())
     return false;
-  }
 
   for (AutofillElementList::iterator itr = elements.begin();
        itr != elements.end(); itr++) {
@@ -482,10 +435,6 @@ bool AutofillTable::RemoveFormElementForTimeRange(int64 pair_id,
   sql::Statement s(db_->GetUniqueStatement(
       "DELETE FROM autofill_dates WHERE pair_id = ? AND "
       "date_created >= ? AND date_created < ?"));
-  if (!s) {
-    NOTREACHED() << "Statement 1 prepare failed";
-    return false;
-  }
   s.BindInt64(0, pair_id);
   s.BindInt64(1, delete_begin.is_null() ? 0 : delete_begin.ToTimeT());
   s.BindInt64(2, delete_end.is_null() ? std::numeric_limits<int64>::max() :
@@ -523,17 +472,18 @@ bool AutofillTable::GetIDAndCountOfFormElement(
     const FormField& element,
     int64* pair_id,
     int* count) {
+  DCHECK(pair_id);
+  DCHECK(count);
+
   sql::Statement s(db_->GetUniqueStatement(
       "SELECT pair_id, count FROM autofill "
       "WHERE name = ? AND value = ?"));
-  if (!s) {
-    NOTREACHED() << "Statement prepare failed";
-    return false;
-  }
-
   s.BindString16(0, element.name);
   s.BindString16(1, element.value);
 
+  if (!s.is_valid())
+    return false;
+
   *pair_id = 0;
   *count = 0;
 
@@ -546,13 +496,9 @@ bool AutofillTable::GetIDAndCountOfFormElement(
 }
 
 bool AutofillTable::GetCountOfFormElement(int64 pair_id, int* count) {
+  DCHECK(count);
   sql::Statement s(db_->GetUniqueStatement(
       "SELECT count FROM autofill WHERE pair_id = ?"));
-  if (!s) {
-    NOTREACHED() << "Statement prepare failed";
-    return false;
-  }
-
   s.BindInt64(0, pair_id);
 
   if (s.Step()) {
@@ -565,38 +511,23 @@ bool AutofillTable::GetCountOfFormElement(int64 pair_id, int* count) {
 bool AutofillTable::SetCountOfFormElement(int64 pair_id, int count) {
   sql::Statement s(db_->GetUniqueStatement(
       "UPDATE autofill SET count = ? WHERE pair_id = ?"));
-  if (!s) {
-    NOTREACHED() << "Statement prepare failed";
-    return false;
-  }
-
   s.BindInt(0, count);
   s.BindInt64(1, pair_id);
-  if (!s.Run()) {
-    NOTREACHED();
-    return false;
-  }
 
-  return true;
+  return s.Run();
 }
 
 bool AutofillTable::InsertFormElement(const FormField& element,
                                       int64* pair_id) {
+  DCHECK(pair_id);
   sql::Statement s(db_->GetUniqueStatement(
       "INSERT INTO autofill (name, value, value_lower) VALUES (?,?,?)"));
-  if (!s) {
-    NOTREACHED() << "Statement prepare failed";
-    return false;
-  }
-
   s.BindString16(0, element.name);
   s.BindString16(1, element.value);
   s.BindString16(2, base::i18n::ToLower(element.value));
 
-  if (!s.Run()) {
-    NOTREACHED();
+  if (!s.Run())
     return false;
-  }
 
   *pair_id = db_->GetLastInsertRowId();
   return true;
@@ -607,20 +538,10 @@ bool AutofillTable::InsertPairIDAndDate(int64 pair_id,
   sql::Statement s(db_->GetUniqueStatement(
       "INSERT INTO autofill_dates "
       "(pair_id, date_created) VALUES (?, ?)"));
-  if (!s) {
-    NOTREACHED() << "Statement prepare failed";
-    return false;
-  }
-
   s.BindInt64(0, pair_id);
   s.BindInt64(1, date_created.ToTimeT());
 
-  if (!s.Run()) {
-    NOTREACHED();
-    return false;
-  }
-
-  return true;
+  return s.Run();
 }
 
 bool AutofillTable::AddFormFieldValuesTime(
@@ -649,10 +570,8 @@ bool AutofillTable::AddFormFieldValuesTime(
 bool AutofillTable::ClearAutofillEmptyValueElements() {
   sql::Statement s(db_->GetUniqueStatement(
       "SELECT pair_id FROM autofill WHERE TRIM(value)= \"\""));
-  if (!s) {
-    NOTREACHED() << "Statement prepare failed";
+  if (!s.is_valid())
     return false;
-  }
 
   std::set<int64> ids;
   while (s.Step())
@@ -674,11 +593,6 @@ bool AutofillTable::GetAllAutofillEntries(std::vector<AutofillEntry>* entries) {
       "SELECT name, value, date_created FROM autofill a JOIN "
       "autofill_dates ad ON a.pair_id=ad.pair_id"));
 
-  if (!s) {
-    NOTREACHED() << "Statement prepare failed";
-    return false;
-  }
-
   bool first_entry = true;
   AutofillKey* current_key_ptr = NULL;
   std::vector<Time>* timestamps_ptr = NULL;
@@ -712,6 +626,10 @@ bool AutofillTable::GetAllAutofillEntries(std::vector<AutofillEntry>* entries) {
       timestamps_ptr->push_back(time);
     }
   }
+
+  if (!s.is_valid())
+    return false;
+
   // If there is at least one result returned, first_entry will be false.
   // For this case we need to do a final cleanup step.
   if (!first_entry) {
@@ -732,14 +650,9 @@ bool AutofillTable::GetAutofillTimestamps(const string16& name,
       "SELECT date_created FROM autofill a JOIN "
       "autofill_dates ad ON a.pair_id=ad.pair_id "
       "WHERE a.name = ? AND a.value = ?"));
-
-  if (!s) {
-    NOTREACHED() << "Statement prepare failed";
-    return false;
-  }
-
   s.BindString16(0, name);
   s.BindString16(1, value);
+
   while (s.Step())
     timestamps->push_back(Time::FromTimeT(s.ColumnInt64(0)));
 
@@ -756,13 +669,12 @@ bool AutofillTable::UpdateAutofillEntries(
     std::string sql = "SELECT pair_id FROM autofill "
                       "WHERE name = ? AND value = ?";
     sql::Statement s(db_->GetUniqueStatement(sql.c_str()));
-    if (!s.is_valid()) {
-      NOTREACHED() << "Statement prepare failed";
-      return false;
-    }
-
     s.BindString16(0, entries[i].key().name());
     s.BindString16(1, entries[i].key().value());
+
+    if (!s.is_valid())
+      return false;
+
     if (s.Step()) {
       if (!RemoveFormElementForID(s.ColumnInt64(0)))
         return false;
@@ -782,20 +694,13 @@ bool AutofillTable::InsertAutofillEntry(const AutofillEntry& entry) {
   std::string sql = "INSERT INTO autofill (name, value, value_lower, count) "
                     "VALUES (?, ?, ?, ?)";
   sql::Statement s(db_->GetUniqueStatement(sql.c_str()));
-  if (!s.is_valid()) {
-    NOTREACHED() << "Statement prepare failed";
-    return false;
-  }
-
   s.BindString16(0, entry.key().name());
   s.BindString16(1, entry.key().value());
   s.BindString16(2, base::i18n::ToLower(entry.key().value()));
   s.BindInt(3, entry.timestamps().size());
 
-  if (!s.Run()) {
-    NOTREACHED();
+  if (!s.Run())
     return false;
-  }
 
   int64 pair_id = db_->GetLastInsertRowId();
   for (size_t i = 0; i < entry.timestamps().size(); i++) {
@@ -838,10 +743,6 @@ bool AutofillTable::RemoveFormElement(const string16& name,
   // Find the id for that pair.
   sql::Statement s(db_->GetUniqueStatement(
       "SELECT pair_id FROM autofill WHERE  name = ? AND value= ?"));
-  if (!s) {
-    NOTREACHED() << "Statement 1 prepare failed";
-    return false;
-  }
   s.BindString16(0, name);
   s.BindString16(1, value);
 
@@ -859,19 +760,9 @@ bool AutofillTable::AddAutofillProfile(const AutofillProfile& profile) {
       "(guid, company_name, address_line_1, address_line_2, city, state,"
       " zipcode, country, country_code, date_modified)"
       "VALUES (?,?,?,?,?,?,?,?,?,?)"));
-  if (!s) {
-    NOTREACHED() << "Statement prepare failed";
-    return false;
-  }
-
   BindAutofillProfileToStatement(profile, &s);
 
-  if (!s.Run()) {
-    NOTREACHED();
-    return false;
-  }
-
-  if (!s.Succeeded())
+  if (!s.Run())
     return false;
 
   return AddAutofillProfilePieces(profile, db_);
@@ -886,16 +777,9 @@ bool AutofillTable::GetAutofillProfile(const std::string& guid,
       " zipcode, country, country_code, date_modified "
       "FROM autofill_profiles "
       "WHERE guid=?"));
-  if (!s) {
-    NOTREACHED() << "Statement prepare failed";
-    return false;
-  }
-
   s.BindString(0, guid);
-  if (!s.Step())
-    return false;
 
-  if (!s.Succeeded())
+  if (!s.Step())
     return false;
 
   scoped_ptr<AutofillProfile> p(AutofillProfileFromStatement(s));
@@ -921,10 +805,6 @@ bool AutofillTable::GetAutofillProfiles(
   sql::Statement s(db_->GetUniqueStatement(
       "SELECT guid "
       "FROM autofill_profiles"));
-  if (!s) {
-    NOTREACHED() << "Statement prepare failed";
-    return false;
-  }
 
   while (s.Step()) {
     std::string guid = s.ColumnString(0);
@@ -995,13 +875,9 @@ bool AutofillTable::UpdateAutofillProfileMulti(const AutofillProfile& profile) {
       "    city=?, state=?, zipcode=?, country=?, country_code=?, "
       "    date_modified=? "
       "WHERE guid=?"));
-  if (!s) {
-    NOTREACHED() << "Statement prepare failed";
-    return false;
-  }
-
   BindAutofillProfileToStatement(profile, &s);
   s.BindString(10, profile.guid());
+
   bool result = s.Run();
   DCHECK_GT(db_->GetLastChangeCount(), 0);
   if (!result)
@@ -1020,27 +896,15 @@ bool AutofillTable::RemoveAutofillProfile(const std::string& guid) {
   if (IsAutofillGUIDInTrash(guid)) {
     sql::Statement s_trash(db_->GetUniqueStatement(
         "DELETE FROM autofill_profiles_trash WHERE guid = ?"));
-    if (!s_trash) {
-      NOTREACHED() << "Statement prepare failed";
-      return false;
-    }
     s_trash.BindString(0, guid);
-    if (!s_trash.Run()) {
-      NOTREACHED() << "Expected item in trash.";

[Scott Hess - ex-Googler, 2011/12/15 23:02:57]

This looks like they might have originally meant
DCHECK_GT(db_->GetLastChangeCount(), 0);

[Greg Billock, 2011/12/16 17:26:58]

Added. I think you're right.

-      return false;
-    }
 
-    return true;
+    return s_trash.Run();
   }
 
   sql::Statement s(db_->GetUniqueStatement(
       "DELETE FROM autofill_profiles WHERE guid = ?"));
-  if (!s) {
-    NOTREACHED() << "Statement prepare failed";
-    return false;
-  }
-
   s.BindString(0, guid);
+
   if (!s.Run())
     return false;
 
@@ -1050,45 +914,26 @@ bool AutofillTable::RemoveAutofillProfile(const std::string& guid) {
 bool AutofillTable::ClearAutofillProfiles() {
   sql::Statement s1(db_->GetUniqueStatement(
       "DELETE FROM autofill_profiles"));
-  if (!s1) {
-    NOTREACHED() << "Statement prepare failed";
-    return false;
-  }
 
   if (!s1.Run())
     return false;
 
   sql::Statement s2(db_->GetUniqueStatement(
       "DELETE FROM autofill_profile_names"));
-  if (!s2) {
-    NOTREACHED() << "Statement prepare failed";
-    return false;
-  }
 
   if (!s2.Run())
     return false;
 
   sql::Statement s3(db_->GetUniqueStatement(
       "DELETE FROM autofill_profile_emails"));
-  if (!s3) {
-    NOTREACHED() << "Statement prepare failed";
-    return false;
-  }
 
   if (!s3.Run())
     return false;
 
   sql::Statement s4(db_->GetUniqueStatement(
       "DELETE FROM autofill_profile_phones"));
-  if (!s4) {
-    NOTREACHED() << "Statement prepare failed";
-    return false;
-  }
-
-  if (!s4.Run())
-    return false;
 
-  return true;
+  return s4.Run();
 }
 
 bool AutofillTable::AddCreditCard(const CreditCard& credit_card) {
@@ -1097,20 +942,13 @@ bool AutofillTable::AddCreditCard(const CreditCard& credit_card) {
       "(guid, name_on_card, expiration_month, expiration_year, "
       "card_number_encrypted, date_modified)"
       "VALUES (?,?,?,?,?,?)"));
-  if (!s) {
-    NOTREACHED() << "Statement prepare failed";
-    return false;
-  }
-
   BindCreditCardToStatement(credit_card, &s);
 
-  if (!s.Run()) {
-    NOTREACHED();
+  if (!s.Run())
     return false;
-  }
 
   DCHECK_GT(db_->GetLastChangeCount(), 0);
-  return s.Succeeded();
+  return true;
 }
 
 bool AutofillTable::GetCreditCard(const std::string& guid,
@@ -1121,18 +959,13 @@ bool AutofillTable::GetCreditCard(const std::string& guid,
       "card_number_encrypted, date_modified "
       "FROM credit_cards "
       "WHERE guid = ?"));
-  if (!s) {
-    NOTREACHED() << "Statement prepare failed";
-    return false;
-  }
-
   s.BindString(0, guid);
+
   if (!s.Step())
     return false;
 
   *credit_card = CreditCardFromStatement(s);
-
-  return s.Succeeded();
+  return true;
 }
 
 bool AutofillTable::GetCreditCards(
@@ -1143,10 +976,6 @@ bool AutofillTable::GetCreditCards(
   sql::Statement s(db_->GetUniqueStatement(
       "SELECT guid "
       "FROM credit_cards"));
-  if (!s) {
-    NOTREACHED() << "Statement prepare failed";
-    return false;
-  }
 
   while (s.Step()) {
     std::string guid = s.ColumnString(0);
@@ -1176,13 +1005,9 @@ bool AutofillTable::UpdateCreditCard(const CreditCard& credit_card) {
       "SET guid=?, name_on_card=?, expiration_month=?, "
       "    expiration_year=?, card_number_encrypted=?, date_modified=? "
       "WHERE guid=?"));
-  if (!s) {
-    NOTREACHED() << "Statement prepare failed";
-    return false;
-  }
-
   BindCreditCardToStatement(credit_card, &s);
   s.BindString(6, credit_card.guid());
+
   bool result = s.Run();
   DCHECK_GT(db_->GetLastChangeCount(), 0);
   return result;
@@ -1192,12 +1017,8 @@ bool AutofillTable::RemoveCreditCard(const std::string& guid) {
   DCHECK(guid::IsValidGUID(guid));
   sql::Statement s(db_->GetUniqueStatement(
       "DELETE FROM credit_cards WHERE guid = ?"));
-  if (!s) {
-    NOTREACHED() << "Statement prepare failed";
-    return false;
-  }
-
   s.BindString(0, guid);
+
   return s.Run();
 }
 
@@ -1217,13 +1038,12 @@ bool AutofillTable::RemoveAutofillProfilesAndCreditCardsModifiedBetween(
   sql::Statement s_profiles_get(db_->GetUniqueStatement(
       "SELECT guid FROM autofill_profiles "
       "WHERE date_modified >= ? AND date_modified < ?"));
-  if (!s_profiles_get) {
-    NOTREACHED() << "Autofill profiles statement prepare failed";
-    return false;
-  }
-
   s_profiles_get.BindInt64(0, delete_begin_t);
   s_profiles_get.BindInt64(1, delete_end_t);
+
+  if (!s_profiles_get.is_valid())
+    return false;
+
   profile_guids->clear();
   while (s_profiles_get.Step()) {
     std::string guid = s_profiles_get.ColumnString(0);
@@ -1234,31 +1054,26 @@ bool AutofillTable::RemoveAutofillProfilesAndCreditCardsModifiedBetween(
   sql::Statement s_profiles(db_->GetUniqueStatement(
       "DELETE FROM autofill_profiles "
       "WHERE date_modified >= ? AND date_modified < ?"));
-  if (!s_profiles) {
-    NOTREACHED() << "Autofill profiles statement prepare failed";
-    return false;
-  }
-
   s_profiles.BindInt64(0, delete_begin_t);
   s_profiles.BindInt64(1, delete_end_t);
-  s_profiles.Run();
 
-  if (!s_profiles.Succeeded()) {
-    NOTREACHED();
+  if (!s_profiles.is_valid())
+    return false;
+
+  s_profiles.Run();
+  if (!s_profiles.Succeeded())
     return false;
-  }
 
   // Remember Autofill credit cards in the time range.
   sql::Statement s_credit_cards_get(db_->GetUniqueStatement(
       "SELECT guid FROM credit_cards "
       "WHERE date_modified >= ? AND date_modified < ?"));
-  if (!s_credit_cards_get) {
-    NOTREACHED() << "Autofill profiles statement prepare failed";
-    return false;
-  }
-
   s_credit_cards_get.BindInt64(0, delete_begin_t);
   s_credit_cards_get.BindInt64(1, delete_end_t);
+
+  if (!s_credit_cards_get.is_valid())
+    return false;
+
   credit_card_guids->clear();
   while (s_credit_cards_get.Step()) {
     std::string guid = s_credit_cards_get.ColumnString(0);
@@ -1269,21 +1084,14 @@ bool AutofillTable::RemoveAutofillProfilesAndCreditCardsModifiedBetween(
   sql::Statement s_credit_cards(db_->GetUniqueStatement(
       "DELETE FROM credit_cards "
       "WHERE date_modified >= ? AND date_modified < ?"));
-  if (!s_credit_cards) {
-    NOTREACHED() << "Autofill credit cards statement prepare failed";
-    return false;
-  }
-
   s_credit_cards.BindInt64(0, delete_begin_t);
   s_credit_cards.BindInt64(1, delete_end_t);
-  s_credit_cards.Run();
 
-  if (!s_credit_cards.Succeeded()) {
-    NOTREACHED();
+  if (!s_credit_cards.is_valid())
     return false;
-  }
 
-  return true;
+  s_credit_cards.Run();
+  return s_credit_cards.Succeeded();
 }
 
 bool AutofillTable::GetAutofillProfilesInTrash(
@@ -1293,10 +1101,6 @@ bool AutofillTable::GetAutofillProfilesInTrash(
   sql::Statement s(db_->GetUniqueStatement(
       "SELECT guid "
       "FROM autofill_profiles_trash"));
-  if (!s) {
-    NOTREACHED() << "Statement prepare failed";
-    return false;
-  }
 
   while (s.Step()) {
     std::string guid = s.ColumnString(0);
@@ -1309,10 +1113,6 @@ bool AutofillTable::GetAutofillProfilesInTrash(
 bool AutofillTable::EmptyAutofillProfilesTrash() {
   sql::Statement s(db_->GetUniqueStatement(
       "DELETE FROM autofill_profiles_trash"));
-  if (!s) {
-    NOTREACHED() << "Statement prepare failed";
-    return false;
-  }
 
   return s.Run();
 }
@@ -1321,11 +1121,8 @@ bool AutofillTable::EmptyAutofillProfilesTrash() {
 bool AutofillTable::RemoveFormElementForID(int64 pair_id) {
   sql::Statement s(db_->GetUniqueStatement(
       "DELETE FROM autofill WHERE pair_id = ?"));
-  if (!s) {
-    NOTREACHED() << "Statement prepare failed";
-    return false;
-  }
   s.BindInt64(0, pair_id);
+
   if (s.Run())
     return RemoveFormElementForTimeRange(pair_id, Time(), Time(), NULL);
 
@@ -1337,27 +1134,15 @@ bool AutofillTable::AddAutofillGUIDToTrash(const std::string& guid) {
     "INSERT INTO autofill_profiles_trash"
     " (guid) "
     "VALUES (?)"));
-  if (!s) {
-    NOTREACHED();
-    return sql::INIT_FAILURE;

[Scott Hess - ex-Googler, 2011/12/15 23:02:57]

I wish this hadn't compiled in the first place ...

-  }
-
   s.BindString(0, guid);
-  if (!s.Run()) {
-    NOTREACHED();
-    return false;
-  }
-  return true;
+
+  return s.Run();
 }
 
 bool AutofillTable::IsAutofillProfilesTrashEmpty() {
   sql::Statement s(db_->GetUniqueStatement(
       "SELECT guid "
       "FROM autofill_profiles_trash"));
-  if (!s) {
-    NOTREACHED() << "Statement prepare failed";
-    return false;
-  }
 
   return !s.Step();
 }
@@ -1367,12 +1152,8 @@ bool AutofillTable::IsAutofillGUIDInTrash(const std::string& guid) {
       "SELECT guid "
       "FROM autofill_profiles_trash "
       "WHERE guid = ?"));
-  if (!s) {
-    NOTREACHED() << "Statement prepare failed";
-    return false;
-  }
-
   s.BindString(0, guid);
+
   return s.Step();
 }
 
@@ -1635,7 +1416,7 @@ bool AutofillTable::MigrateToVersion27UpdateLegacyCreditCards() {
       "FROM autofill_profiles, credit_cards "
       "WHERE credit_cards.billing_address = autofill_profiles.label";
   sql::Statement s(db_->GetUniqueStatement(stmt.c_str()));
-  if (!s)
+  if (!s.is_valid())
     return false;
 
   std::map<int, int> cc_billing_map;
@@ -1647,7 +1428,7 @@ bool AutofillTable::MigrateToVersion27UpdateLegacyCreditCards() {
   if (cc_billing_map.empty()) {
     std::string stmt = "SELECT unique_id,billing_address FROM credit_cards";
     sql::Statement s(db_->GetUniqueStatement(stmt.c_str()));
-    if (!s)
+    if (!s.is_valid())
       return false;
 
     while (s.Step()) {
@@ -1693,9 +1474,6 @@ bool AutofillTable::MigrateToVersion27UpdateLegacyCreditCards() {
     sql::Statement s(db_->GetCachedStatement(
         SQL_FROM_HERE,
         "UPDATE credit_cards SET billing_address=? WHERE unique_id=?"));
-    if (!s)
-      return false;
-
     s.BindInt(0, (*iter).second);
     s.BindInt(1, (*iter).first);
 
@@ -1716,9 +1494,6 @@ bool AutofillTable::MigrateToVersion30AddDateModifed() {
 
     sql::Statement s(db_->GetUniqueStatement(
         "UPDATE autofill_profiles SET date_modified=?"));
-    if (!s)
-      return false;
-
     s.BindInt64(0, Time::Now().ToTimeT());
 
     if (!s.Run())
@@ -1734,9 +1509,6 @@ bool AutofillTable::MigrateToVersion30AddDateModifed() {
 
     sql::Statement s(db_->GetUniqueStatement(
         "UPDATE credit_cards SET date_modified=?"));
-    if (!s)
-      return false;
-
     s.BindInt64(0, Time::Now().ToTimeT());
 
     if (!s.Run())
@@ -1760,15 +1532,13 @@ bool AutofillTable::MigrateToVersion31AddGUIDToCreditCardsAndProfiles() {
 
     sql::Statement s(db_->GetUniqueStatement("SELECT unique_id "
                                              "FROM autofill_profiles"));
-    if (!s)
+    if (!s.is_valid())
       return false;
 
     while (s.Step()) {
       sql::Statement update_s(
           db_->GetUniqueStatement("UPDATE autofill_profiles "
                                   "SET guid=? WHERE unique_id=?"));
-      if (!update_s)
-        return false;
       update_s.BindString(0, guid::GenerateGUID());
       update_s.BindInt(1, s.ColumnInt(0));
 
@@ -1790,14 +1560,14 @@ bool AutofillTable::MigrateToVersion31AddGUIDToCreditCardsAndProfiles() {
 
     sql::Statement s(db_->GetUniqueStatement("SELECT unique_id "
                                              "FROM credit_cards"));
-    if (!s)
+    if (!s.is_valid())
       return false;
 
     while (s.Step()) {
       sql::Statement update_s(
           db_->GetUniqueStatement("UPDATE credit_cards "
                                   "set guid=? WHERE unique_id=?"));
-      if (!update_s)
+      if (!update_s.is_valid())
         return false;

[Scott Hess - ex-Googler, 2011/12/15 23:02:57]

Could be removed?

[Greg Billock, 2011/12/16 17:26:58]

Done.

       update_s.BindString(0, guid::GenerateGUID());
       update_s.BindInt(1, s.ColumnInt(0));
@@ -1906,6 +1676,7 @@ bool AutofillTable::MigrateToVersion33ProfilesBasedOnFirstName() {
         "company_name, address_line_1, address_line_2, city, state, "
         "zipcode, country, phone, date_modified "
         "FROM autofill_profiles"));
+
     while (s.Step()) {
       AutofillProfile profile;
       profile.set_guid(s.ColumnString(0));
@@ -1930,9 +1701,6 @@ bool AutofillTable::MigrateToVersion33ProfilesBasedOnFirstName() {
           "(guid, company_name, address_line_1, address_line_2, city,"
           " state, zipcode, country, date_modified)"
           "VALUES (?,?,?,?,?,?,?,?,?)"));
-      if (!s)
-        return false;
-
       s_insert.BindString(0, profile.guid());
       s_insert.BindString16(1, profile.GetInfo(COMPANY_NAME));
       s_insert.BindString16(2, profile.GetInfo(ADDRESS_HOME_LINE1));
@@ -2005,15 +1773,13 @@ bool AutofillTable::MigrateToVersion34ProfilesBasedOnCountryCode() {
     sql::Statement s(db_->GetUniqueStatement("SELECT guid, country "
                                              "FROM autofill_profiles"));
 
-    if (!s)
+    if (!s.is_valid())
       return false;
 
     while (s.Step()) {
       sql::Statement update_s(
           db_->GetUniqueStatement("UPDATE autofill_profiles "
                                   "SET country_code=? WHERE guid=?"));
-      if (!update_s)
-        return false;
 
       string16 country = s.ColumnString16(1);
       std::string app_locale = AutofillCountry::ApplicationLocale();
@@ -2044,7 +1810,7 @@ bool AutofillTable::MigrateToVersion35GreatBritainCountryCodes() {
 bool AutofillTable::MigrateToVersion37MergeAndCullOlderProfiles() {
   sql::Statement s(db_->GetUniqueStatement(
       "SELECT guid, date_modified FROM autofill_profiles"));
-  if (!s)
+  if (!s.is_valid())
     return false;
 
   // Accumulate the good profiles.
@@ -2109,6 +1875,7 @@ bool AutofillTable::MigrateToVersion37MergeAndCullOlderProfiles() {
         "WHERE guid=?"));
     s_date.BindInt64(0, date_item->second);
     s_date.BindString(1, iter->guid());
+
     if (!s_date.Run())
       return false;
   }