Remove ref counting on 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/file_util.h"
 #include "base/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"
 
 class StatementErrorHandler : public sql::ErrorDelegate {
  public:
   StatementErrorHandler() : error_(SQLITE_OK) {}
 
+  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;
   }
 
   int error() const { return error_; }
 
   void reset_error() {
     sql_text_.clear();
     error_ = SQLITE_OK;
   }
 
   const char* sql_statement() const { return sql_text_.c_str(); }
 
- protected:
-  virtual ~StatementErrorHandler() {}
-
  private:
   int error_;
   std::string sql_text_;
+
+ DISALLOW_COPY_AND_ASSIGN(StatementErrorHandler);
 };
 
 class SQLStatementTest : public testing::Test {
  public:
   SQLStatementTest() : error_handler_(new StatementErrorHandler) {}

[Scott Hess - ex-Googler, 2012/10/12 20:04:51]

Same thing in this file as the other file.

 
   void SetUp() {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     ASSERT_TRUE(db_.Open(temp_dir_.path().AppendASCII("SQLStatementTest.db")));
 
     // The |error_handler_| will be called if any sqlite statement operation
     // returns an error code.
     db_.set_error_delegate(error_handler_);
   }
 
   void TearDown() {
     // If any error happened the original sql statement can be found in
     // error_handler_->sql_statement().
     EXPECT_EQ(SQLITE_OK, error_handler_->error());
     db_.Close();
   }
 
   sql::Connection& db() { return db_; }
 
   int sqlite_error() const { return error_handler_->error(); }
   void reset_error() const { error_handler_->reset_error(); }
 
  private:
   ScopedTempDir temp_dir_;
   sql::Connection db_;
-  scoped_refptr<StatementErrorHandler> error_handler_;
+  StatementErrorHandler* error_handler_;
 };
 
 TEST_F(SQLStatementTest, Assign) {
   sql::Statement s;
   EXPECT_FALSE(s.is_valid());
 
   s.Assign(db().GetUniqueStatement("CREATE TABLE foo (a, b)"));
   EXPECT_TRUE(s.is_valid());
 }
 
@@ skipping 56 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());
 }