Remove sql::ErrorDelegate.

sql/connection.h

 // 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.
 
 #ifndef SQL_CONNECTION_H_
 #define SQL_CONNECTION_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 60 matching lines @@
 
  private:
   int number_;
   const char* str_;
 };
 
 #define SQL_FROM_HERE sql::StatementID(__FILE__, __LINE__)
 
 class Connection;
 
-// ErrorDelegate defines the interface to implement error handling and recovery
-// for sqlite operations. This allows the rest of the classes to return true or
-// false while the actual error code and causing statement are delivered using
-// the OnError() callback.
-// The tipical usage is to centralize the code designed to handle database
-// corruption, low-level IO errors or locking violations.
-class SQL_EXPORT ErrorDelegate {
- public:
-  virtual ~ErrorDelegate();
-
-  // |error| is an sqlite result code as seen in sqlite3.h. |connection| is the
-  // db connection where the error happened and |stmt| is our best guess at the
-  // statement that triggered the error. Do not store these pointers.
-  //
-  // |stmt| MAY BE NULL if there is no statement causing the problem (i.e. on
-  // initialization).
-  //
-  // If the error condition has been fixed and the original statement succesfuly
-  // re-tried then returning SQLITE_OK is appropriate; otherwise it is
-  // recommended that you return the original |error| or the appropriate error
-  // code.
-  virtual int OnError(int error, Connection* connection, Statement* stmt) = 0;
-};
-
 class SQL_EXPORT Connection {
  private:
   class StatementRef;  // Forward declaration, see real one below.
 
  public:
   // The database is opened by calling Open[InMemory](). Any uncommitted
   // transactions will be rolled back when this object is deleted.
   Connection();
   ~Connection();
 
@@ skipping 23 matching lines @@
   // next transaction because it doesn't have to re-aquire locks.
   //
   // This must be called before Open() to have an effect.
   void set_exclusive_locking() { exclusive_locking_ = true; }
 
   // Set an error-handling callback.  On errors, the error number (and
   // statement, if available) will be passed to the callback.
   //
   // If no callback is set, the default action is to crash in debug
   // mode or return failure in release mode.
-  //
-  // TODO(shess): ErrorDelegate allowed for returning a different
-  // error.  Determine if this is necessary for the callback.  In my
-  // experience, this is not well-tested and probably not safe, and
-  // current clients always return the same error passed.
-  // Additionally, most errors don't admit to a clean way to retry the
-  // failed operation, so converting an error to SQLITE_OK is probably
-  // not feasible.
   typedef base::Callback<void(int, Statement*)> ErrorCallback;
   void set_error_callback(const ErrorCallback& callback) {
     error_callback_ = callback;
   }
   void reset_error_callback() {
     error_callback_.Reset();
   }
 
-  // Sets the object that will handle errors. Recomended that it should be set
-  // before calling Open(). If not set, the default is to ignore errors on
-  // release and assert on debug builds.
-  // Takes ownership of |delegate|.
-  // NOTE(shess): Deprecated, use set_error_callback().
-  void set_error_delegate(ErrorDelegate* delegate) {
-    error_delegate_.reset(delegate);
-  }
-
   // Set this tag to enable additional connection-type histogramming
   // for SQLite error codes and database version numbers.
   void set_histogram_tag(const std::string& tag) {
     histogram_tag_ = tag;
   }
 
   // Record a sparse UMA histogram sample under
   // |name|+"."+|histogram_tag_|.  If |histogram_tag_| is empty, no
   // histogram is recorded.
   void AddTaggedHistogram(const std::string& name, size_t sample) const;
@@ skipping 339 matching lines @@
   bool in_memory_;
 
   // |true| if the connection was closed using RazeAndClose().  Used
   // to enable diagnostics to distinguish calls to never-opened
   // databases (incorrect use of the API) from calls to once-valid
   // databases.
   bool poisoned_;
 
   ErrorCallback error_callback_;
 
-  // This object handles errors resulting from all forms of executing sqlite
-  // commands or statements. It can be null which means default handling.
-  scoped_ptr<ErrorDelegate> error_delegate_;
-
   // Tag for auxiliary histograms.
   std::string histogram_tag_;
 
   DISALLOW_COPY_AND_ASSIGN(Connection);
 };
 
 }  // namespace sql
 
 #endif  // SQL_CONNECTION_H_