Remove sql::ErrorDelegate.

Remove sql::ErrorDelegate.

API cleanup.  Replaced by ErrorCallback.

BUG=none

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=206299

[erikwright (departed), 2013-06-13 01:35:30]

LGTM.

https://codereview.chromium.org/16788002/diff/1/sql/statement_unittest.cc
File sql/statement_unittest.cc (right):

https://codereview.chromium.org/16788002/diff/1/sql/statement_unittest.cc#new...
sql/statement_unittest.cc:19: *error_pointer = error;
Maybe with the other CL that makes test_support_sql you could de-dup this code.

Not a barrier to landing, but a bonus for after.

[Scott Hess - ex-Googler, 2013-06-13 02:32:06]

thanks!

https://codereview.chromium.org/16788002/diff/1/sql/statement_unittest.cc
File sql/statement_unittest.cc (right):

https://codereview.chromium.org/16788002/diff/1/sql/statement_unittest.cc#new...
sql/statement_unittest.cc:19: *error_pointer = error;
On 2013/06/13 01:35:30, erikwright wrote:
> Maybe with the other CL that makes test_support_sql you could de-dup this
code.
> 
> Not a barrier to landing, but a bonus for after.

Probably, though it occurs to me that I don't have an explicit error-callback
test anywhere.

[commit-bot: I haz the power, 2013-06-13 04:01:20]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/[email protected]/16788002/1

[commit-bot: I haz the power, 2013-06-13 07:14:33]

Sorry for I got bad news for ya.
Compile failed with a clobber build on mac_rel.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=mac_rel&nu...
Your code is likely broken or HEAD is junk. Please ensure your
code is not broken then alert the build sheriffs.
Look at the try server FAQ for more details.

[commit-bot: I haz the power, 2013-06-13 17:07:03]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/[email protected]/16788002/1

[commit-bot: I haz the power, 2013-06-13 23:08:50]

Failed to apply patch for sql/connection.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file sql/connection.cc
  Hunk #2 FAILED at 119.
  Hunk #3 succeeded at 759 (offset -2 lines).
  1 out of 3 hunks FAILED -- saving rejects to file sql/connection.cc.rej

Patch:       sql/connection.cc
Index: sql/connection.cc
diff --git a/sql/connection.cc b/sql/connection.cc
index
4eb060b879a9fb1683ae77f1a865b600315245a8..510d6a771b4b7598e4f83f6cba68ded7520b3cb0
100644
--- a/sql/connection.cc
+++ b/sql/connection.cc
@@ -74,9 +74,6 @@ bool StatementID::operator<(const StatementID& other) const {
   return strcmp(str_, other.str_) < 0;
 }
 
-ErrorDelegate::~ErrorDelegate() {
-}
-
 Connection::StatementRef::StatementRef(Connection* connection,
                                        sqlite3_stmt* stmt,
                                        bool was_valid)
@@ -122,8 +119,7 @@ Connection::Connection()
       transaction_nesting_(0),
       needs_rollback_(false),
       in_memory_(false),
-      poisoned_(false),
-      error_delegate_(NULL) {
+      poisoned_(false) {
 }
 
 Connection::~Connection() {
@@ -764,11 +760,6 @@ int Connection::OnSqliteError(int err, sql::Statement
*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;

[Scott Hess - ex-Googler, 2013-06-13 23:15:33]

On 2013/06/13 23:08:50, I haz the power (commit-bot) wrote:
> Failed to apply patch for sql/connection.cc:
> While running patch -p1 --forward --force --no-backup-if-mismatch;
>   patching file sql/connection.cc
>   Hunk #2 FAILED at 119.
>   Hunk #3 succeeded at 759 (offset -2 lines).
>   1 out of 3 hunks FAILED -- saving rejects to file sql/connection.cc.rej
> 
> Patch:       sql/connection.cc
> Index: sql/connection.cc
> diff --git a/sql/connection.cc b/sql/connection.cc
> index
>
4eb060b879a9fb1683ae77f1a865b600315245a8..510d6a771b4b7598e4f83f6cba68ded7520b3cb0
> 100644
> --- a/sql/connection.cc
> +++ b/sql/connection.cc
> @@ -74,9 +74,6 @@ bool StatementID::operator<(const StatementID& other) const
{
>    return strcmp(str_, other.str_) < 0;
>  }
>  
> -ErrorDelegate::~ErrorDelegate() {
> -}
> -
>  Connection::StatementRef::StatementRef(Connection* connection,
>                                         sqlite3_stmt* stmt,
>                                         bool was_valid)
> @@ -122,8 +119,7 @@ Connection::Connection()
>        transaction_nesting_(0),
>        needs_rollback_(false),
>        in_memory_(false),
> -      poisoned_(false),
> -      error_delegate_(NULL) {
> +      poisoned_(false) {
>  }
>  
>  Connection::~Connection() {
> @@ -764,11 +760,6 @@ int Connection::OnSqliteError(int err, sql::Statement
> *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;

Conflict with https://chromiumcodereview.appspot.com/16866008 .  rebasing and
giving it another run.

[commit-bot: I haz the power, 2013-06-13 23:17:25]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/[email protected]/16788002/33002

[commit-bot: I haz the power, 2013-06-14 04:09:15]

Change committed as 206299