More SQL statement usage regularization. Back-touch some

chrome/browser/webdata/keyword_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/keyword_table.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/stats_counters.h"
@@ skipping 35 matching lines @@
     "Default Search Provider ID Backup Signature";
 
 const char kKeywordColumnsConcatenated[] =
     "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";
 
 void BindURLToStatement(const TemplateURL& url, sql::Statement* s) {
-  s->BindString(0, UTF16ToUTF8(url.short_name()));
-  s->BindString(1, UTF16ToUTF8(url.keyword()));
+  s->BindString16(0, url.short_name());
+  s->BindString16(1, url.keyword());
   GURL favicon_url = url.GetFaviconURL();
   if (!favicon_url.is_valid()) {
     s->BindString(2, std::string());
   } else {
     s->BindString(2, history::HistoryDatabase::GURLToDatabaseURL(
         url.GetFaviconURL()));
   }
   s->BindString(3, url.url() ? url.url()->url() : std::string());
   s->BindInt(4, url.safe_for_autoreplace() ? 1 : 0);
   if (!url.originating_url().is_valid()) {
@@ skipping 338 matching lines @@
 
   std::string keywords;
   if (!GetTableContents("keywords", &keywords))
     return false;
 
   std::string data_to_sign = base::Int64ToString(id) +
                              keyword_backup +
                              keywords;
   std::string signature = protector::SignSetting(data_to_sign);
   if (signature.empty())
-    NOTREACHED() << "Signature is empty";
+    return false;
   if (!meta_table_->SetValue(kBackupSignatureKey, signature))
-    NOTREACHED() << "Failed to write signature.";
+    return false;
 
   return transaction.Commit();
 }
 
 bool KeywordTable::MigrateToVersion43AddKeywordsBackupTable() {
   return meta_table_->SetValue(kDefaultSearchBackupKey, std::string()) &&
          UpdateBackupSignature();
 }
 
 bool KeywordTable::MigrateToVersion44UpdateKeywordsBackup() {
@@ skipping 95 matching lines @@
 void KeywordTable::GetURLFromStatement(
     const sql::Statement& s,
     TemplateURL* url) {
   url->set_id(s.ColumnInt64(0));
 
   std::string tmp;
   tmp = s.ColumnString(1);
   DCHECK(!tmp.empty());
   url->set_short_name(UTF8ToUTF16(tmp));
 
-  url->set_keyword(UTF8ToUTF16(s.ColumnString(2)));
+  url->set_keyword(s.ColumnString16(2));
 
   tmp = s.ColumnString(3);
   if (!tmp.empty())
     url->SetFaviconURL(GURL(tmp));
 
   url->SetURL(s.ColumnString(4), 0, 0);
 
   url->set_safe_for_autoreplace(s.ColumnInt(5) == 1);
 
   tmp = s.ColumnString(6);
@@ skipping 71 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;
 }