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

chrome/browser/webdata/keyword_table.cc

 // 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/webdata/keyword_table.h"
 
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/stats_counters.h"
 #include "base/string_number_conversions.h"
@@ skipping 129 matching lines @@
   DCHECK(url.id());
   // Be sure to change kUrlIdPosition if you add columns
   sql::Statement s(db_->GetUniqueStatement(
       "INSERT INTO keywords "
       "(short_name, keyword, favicon_url, url, safe_for_autoreplace, "
       "originating_url, date_created, usage_count, input_encodings, "
       "show_in_default_list, suggest_url, prepopulate_id, "
       "autogenerate_keyword, logo_id, created_by_policy, instant_url, "
       "last_modified, sync_guid, id) VALUES "
       "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"));
-  if (!s) {
-    NOTREACHED() << "Statement prepare failed";
-    return false;
-  }
   BindURLToStatement(url, &s);
   s.BindInt64(kUrlIdPosition, url.id());
+
   if (!s.Run()) {
-    NOTREACHED();
     return false;
   }
   return UpdateBackupSignature();
 }
 
 bool KeywordTable::RemoveKeyword(TemplateURLID id) {
   DCHECK(id);
-  sql::Statement s(db_->GetUniqueStatement("DELETE FROM keywords WHERE id=?"));
-  if (!s) {
-    NOTREACHED() << "Statement prepare failed";
-    return false;
-  }
+  sql::Statement s(
+      db_->GetUniqueStatement("DELETE FROM keywords WHERE id = ?"));
   s.BindInt64(0, id);
+
   return s.Run() && UpdateBackupSignature();
 }
 
 bool KeywordTable::GetKeywords(std::vector<TemplateURL*>* urls) {
   sql::Statement s(db_->GetUniqueStatement(
       "SELECT id, short_name, keyword, favicon_url, url, "
       "safe_for_autoreplace, originating_url, date_created, "
       "usage_count, input_encodings, show_in_default_list, "
       "suggest_url, prepopulate_id, autogenerate_keyword, logo_id, "
       "created_by_policy, instant_url, last_modified, sync_guid "
       "FROM keywords ORDER BY id ASC"));
-  if (!s) {
-    NOTREACHED() << "Statement prepare failed";
-    return false;
-  }
+
   while (s.Step()) {
     TemplateURL* template_url = new TemplateURL();
     GetURLFromStatement(s, template_url);
     urls->push_back(template_url);
   }
   return s.Succeeded();
 }
 
 bool KeywordTable::UpdateKeyword(const TemplateURL& url) {
   DCHECK(url.id());
   // Be sure to change kUrlIdPosition if you add columns
   sql::Statement s(db_->GetUniqueStatement(
       "UPDATE keywords "
       "SET short_name=?, keyword=?, favicon_url=?, url=?, "
       "safe_for_autoreplace=?, originating_url=?, date_created=?, "
       "usage_count=?, input_encodings=?, show_in_default_list=?, "
       "suggest_url=?, prepopulate_id=?, autogenerate_keyword=?, "
       "logo_id=?, created_by_policy=?, instant_url=?, last_modified=?, "
       "sync_guid=? WHERE id=?"));
-  if (!s) {
-    NOTREACHED() << "Statement prepare failed";
-    return false;
-  }
   BindURLToStatement(url, &s);
   s.BindInt64(kUrlIdPosition, url.id());
+
   return s.Run() && UpdateBackupSignature();
 }
 
 bool KeywordTable::SetDefaultSearchProviderID(int64 id) {
   return meta_table_->SetValue(kDefaultSearchProviderKey, id) &&
          UpdateBackupSignature();
 }
 
 int64 KeywordTable::GetDefaultSearchProviderID() {
   int64 value = 0;
@@ skipping 398 matching lines @@
     return false;
   }
   if (!meta_table_->SetValue(kDefaultSearchBackupKey, backup_url)) {
     LOG(WARNING) << "Failed to update the keyword backup";
     return false;
   }
 
   *backup = backup_url;
   return true;
 }