Offer user to send feedback from profile error dialog

components/history/core/browser/history_database.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 "components/history/core/browser/history_database.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <set>
@@ skipping 38 matching lines @@
     : DownloadDatabase(download_interrupt_reason_none,
                        download_interrupt_reason_crash) {
 }
 
 HistoryDatabase::~HistoryDatabase() {
 }
 
 sql::InitStatus HistoryDatabase::Init(const base::FilePath& history_name) {
   db_.set_histogram_tag("History");
 
-  // Set the exceptional sqlite error handler.
-  db_.set_error_callback(error_callback_);
-
   // Set the database page size to something a little larger to give us
   // better performance (we're typically seek rather than bandwidth limited).
   // This only has an effect before any tables have been created, otherwise
   // this is a NOP. Must be a power of 2 and a max of 8192.
   db_.set_page_size(4096);
 
   // Set the cache size. The page size, plus a little extra, times this
   // value, tells us how much memory the cache will use maximum.
   // 1000 * 4kB = 4MB
   // TODO(brettw) scale this value to the amount of available memory.
@@ skipping 180 matching lines @@
 
 void HistoryDatabase::BeginTransaction() {
   db_.BeginTransaction();
 }
 
 void HistoryDatabase::CommitTransaction() {
   db_.CommitTransaction();
 }
 
 void HistoryDatabase::RollbackTransaction() {
-  db_.RollbackTransaction();
+  // If Init() returns with a failure status, the Transaction created there will
+  // be destructed and rolled back. HistoryBackend might try to kill the
+  // database after that, at which point it will try to roll back a non-existing
+  // transaction. This will crash on a DCHECK. So transaction_nesting() is
+  // checked first.
+  if (db_.transaction_nesting())
+    db_.RollbackTransaction();
 }
 
 bool HistoryDatabase::RecreateAllTablesButURL() {
   if (!DropVisitTable())
     return false;
   if (!InitVisitTable())
     return false;
 
   if (!DropKeywordSearchTermsTable())
     return false;
@@ skipping 16 matching lines @@
 }
 
 void HistoryDatabase::TrimMemory(bool aggressively) {
   db_.TrimMemory(aggressively);
 }
 
 bool HistoryDatabase::Raze() {
   return db_.Raze();
 }
 
+std::string HistoryDatabase::GetDiagnosticInfo(int extended_error,
+                                               sql::Statement* statement) {
+  return db_.GetDiagnosticInfo(extended_error, statement);
+}
+
 bool HistoryDatabase::SetSegmentID(VisitID visit_id, SegmentID segment_id) {
   sql::Statement s(db_.GetCachedStatement(SQL_FROM_HERE,
       "UPDATE visits SET segment_id = ? WHERE id = ?"));
   s.BindInt64(0, segment_id);
   s.BindInt64(1, visit_id);
   DCHECK(db_.GetLastChangeCount() == 1);
 
   return s.Run();
 }
 
@@ skipping 228 matching lines @@
       "SET visit_time = visit_time + 11644473600000000 "
       "WHERE id IN (SELECT id FROM visits WHERE visit_time > 0);"));
   ignore_result(db_.Execute(
       "UPDATE segment_usage "
       "SET time_slot = time_slot + 11644473600000000 "
       "WHERE id IN (SELECT id FROM segment_usage WHERE time_slot > 0);"));
 }
 #endif
 
 }  // namespace history