Remove sql::ErrorDelegate.

sql/statement_unittest.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 <string>
 
+#include "base/bind.h"
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "sql/connection.h"
 #include "sql/statement.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/sqlite/sqlite3.h"
 
 namespace {
 
-class StatementErrorHandler : public sql::ErrorDelegate {
- public:
-  StatementErrorHandler(int* error, std::string* sql_text)
-    : error_(error),
-      sql_text_(sql_text) {}
-
-  virtual ~StatementErrorHandler() {}
-
-  virtual int OnError(int error, sql::Connection* connection,
-                      sql::Statement* stmt) OVERRIDE {
-    *error_ = error;
-    const char* sql_txt = stmt ? stmt->GetSQLStatement() : NULL;
-    *sql_text_ = sql_txt ? sql_txt : "no statement available";
-    return error;
-  }
-
- private:
-  int* error_;
-  std::string* sql_text_;
-
- DISALLOW_COPY_AND_ASSIGN(StatementErrorHandler);
-};
+void CaptureErrorCallback(int* error_pointer, std::string* sql_text,
+                          int error, sql::Statement* stmt) {
+  *error_pointer = error;

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

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]

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

+  const char* text = stmt ? stmt->GetSQLStatement() : NULL;
+  *sql_text = text ? text : "no statement available";
+}
 
 class SQLStatementTest : public testing::Test {
  public:
   SQLStatementTest() : error_(SQLITE_OK) {}
 
   virtual void SetUp() {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     ASSERT_TRUE(db_.Open(temp_dir_.path().AppendASCII("SQLStatementTest.db")));
     // The error delegate will set |error_| and |sql_text_| when any sqlite
     // statement operation returns an error code.
-    db_.set_error_delegate(new StatementErrorHandler(&error_, &sql_text_));
+    db_.set_error_callback(base::Bind(&CaptureErrorCallback,
+                                      &error_, &sql_text_));
   }
 
   virtual void TearDown() {
     // If any error happened the original sql statement can be found in
     // |sql_text_|.
     EXPECT_EQ(SQLITE_OK, error_);
     db_.Close();
   }
 
   sql::Connection& db() { return db_; }
@@ skipping 84 matching lines @@
 
   s.Reset(false);
   // Verify that we can get all rows again.
   ASSERT_TRUE(s.Step());
   EXPECT_EQ(12, s.ColumnInt(0));
   EXPECT_FALSE(s.Step());
 
   s.Reset(true);
   ASSERT_FALSE(s.Step());
 }