Remove ref counting on sql::ErrorDelegate

webkit/database/databases_table_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 "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "sql/connection.h"
 #include "sql/statement.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/database/databases_table.h"
 
 namespace {
 
 class TestErrorDelegate : public sql::ErrorDelegate {
  public:
+  TestErrorDelegate() {}
+  virtual ~TestErrorDelegate() {}
+
   virtual int OnError(int error,
                       sql::Connection* connection,
                       sql::Statement* stmt) OVERRIDE {
     return error;
   }
 
- protected:
-  virtual ~TestErrorDelegate() {}
+ private:
+  DISALLOW_COPY_AND_ASSIGN(TestErrorDelegate);
 };
 
 }  // namespace
 
 namespace webkit_database {
 
 static void CheckDetailsAreEqual(const DatabaseDetails& d1,
                                  const DatabaseDetails& d2) {
   EXPECT_EQ(d1.origin_identifier, d2.origin_identifier);
   EXPECT_EQ(d1.database_name, d2.database_name);
   EXPECT_EQ(d1.description, d2.description);
   EXPECT_EQ(d1.estimated_size, d2.estimated_size);
 }
 
 static bool DatabasesTableIsEmpty(sql::Connection* db) {
   sql::Statement statement(db->GetCachedStatement(
       SQL_FROM_HERE, "SELECT COUNT(*) FROM Databases"));
   return (statement.is_valid() && statement.Step() && !statement.ColumnInt(0));
 }
 
 TEST(DatabasesTableTest, TestIt) {
   // Initialize the 'Databases' table.
   sql::Connection db;
 
   // Set an error delegate that will make all operations return false on error.
-  scoped_refptr<TestErrorDelegate> error_delegate(new TestErrorDelegate());
-  db.set_error_delegate(error_delegate);
+  db.set_error_delegate(new TestErrorDelegate());
 
   // Initialize the temp dir and the 'Databases' table.
   EXPECT_TRUE(db.OpenInMemory());
   DatabasesTable databases_table(&db);
   EXPECT_TRUE(databases_table.Init());
 
   // The 'Databases' table should be empty.
   EXPECT_TRUE(DatabasesTableIsEmpty(&db));
 
   // Create the details for a databases.
@@ skipping 84 matching lines @@
       details_in1.origin_identifier,
       details_in1.database_name,
       &details_out1));
 
   // Check that trying to delete a record that doesn't exist fails.
   EXPECT_FALSE(databases_table.DeleteDatabaseDetails(
       ASCIIToUTF16("unknown_origin"), ASCIIToUTF16("unknown_database")));
 }
 
 }  // namespace webkit_database