Remove sql::ErrorDelegate.

sql/connection.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 "sql/connection.h"
 
 #include <string.h>
 
 #include "base/files/file_path.h"
 #include "base/file_util.h"
@@ skipping 56 matching lines @@
 }  // namespace
 
 namespace sql {
 
 bool StatementID::operator<(const StatementID& other) const {
   if (number_ != other.number_)
     return number_ < other.number_;
   return strcmp(str_, other.str_) < 0;
 }
 
-ErrorDelegate::~ErrorDelegate() {
-}
-
 Connection::StatementRef::StatementRef(Connection* connection,
                                        sqlite3_stmt* stmt,
                                        bool was_valid)
     : connection_(connection),
       stmt_(stmt),
       was_valid_(was_valid) {
   if (connection)
     connection_->StatementRefCreated(this);
 }
 
@@ skipping 25 matching lines @@
 }
 
 Connection::Connection()
     : db_(NULL),
       page_size_(0),
       cache_size_(0),
       exclusive_locking_(false),
       transaction_nesting_(0),
       needs_rollback_(false),
       in_memory_(false),
-      poisoned_(false) {}
+      poisoned_(false) {
+}
 
 Connection::~Connection() {
   Close();
 }
 
 bool Connection::Open(const base::FilePath& path) {
   if (!histogram_tag_.empty()) {
     int64 size_64 = 0;
     if (file_util::GetFileSize(path, &size_64)) {
       size_t sample = static_cast<size_t>(size_64 / 1024);
@@ skipping 619 matching lines @@
   // Always log the error.
   LOG(ERROR) << "sqlite error " << err
              << ", errno " << GetLastErrno()
              << ": " << GetErrorMessage();
 
   if (!error_callback_.is_null()) {
     error_callback_.Run(err, stmt);
     return err;
   }
 
-  // TODO(shess): Remove |error_delegate_| once everything is
-  // converted to |error_callback_|.
-  if (error_delegate_.get())
-    return error_delegate_->OnError(err, this, stmt);
-
   // The default handling is to assert on debug and to ignore on release.
   DLOG(FATAL) << GetErrorMessage();
   return err;
 }
 
 // TODO(shess): Allow specifying integrity_check versus quick_check.
 // TODO(shess): Allow specifying maximum results (default 100 lines).
 bool Connection::IntegrityCheck(std::vector<std::string>* messages) {
   messages->clear();
 
@@ skipping 21 matching lines @@
   }
 
   // Best effort to put things back as they were before.
   const char kNoWritableSchema[] = "PRAGMA writable_schema = OFF";
   ignore_result(Execute(kNoWritableSchema));
 
   return ret;
 }
 
 }  // namespace sql