Remove ref counting on sql::ErrorDelegate

webkit/appcache/appcache_database_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 "testing/gtest/include/gtest/gtest.h"
 
 #include "base/file_util.h"
 #include "base/scoped_temp_dir.h"
 #include "base/stringprintf.h"
 #include "sql/connection.h"
 #include "sql/meta_table.h"
 #include "sql/statement.h"
 #include "sql/transaction.h"
 #include "webkit/appcache/appcache_database.h"
 #include "webkit/appcache/appcache_entry.h"
 
 namespace {
 
 const base::Time kZeroTime;
 
 class TestErrorDelegate : public sql::ErrorDelegate {
  public:
+  TestErrorDelegate() {}
+  virtual ~TestErrorDelegate() {}
+
   virtual int OnError(int error,
                       sql::Connection* connection,
                       sql::Statement* stmt) OVERRIDE {
     return error;
   }
 
  private:
-  virtual ~TestErrorDelegate() {}
+  DISALLOW_COPY_AND_ASSIGN(TestErrorDelegate);
 };
 
 }  // namespace
 
 namespace appcache {
 
 class AppCacheDatabaseTest {};
 
 TEST(AppCacheDatabaseTest, LazyOpen) {
   // Use an empty file path to use an in-memory sqlite database.
@@ skipping 41 matching lines @@
   EXPECT_FALSE(file_util::DirectoryExists(kNestedDir));
   EXPECT_FALSE(file_util::PathExists(kOtherFile));
 }
 
 TEST(AppCacheDatabaseTest, EntryRecords) {
   const FilePath kEmptyPath;
   AppCacheDatabase db(kEmptyPath);
   EXPECT_TRUE(db.LazyOpen(true));
 
   // Set an error delegate that will make all operations return false on error.
-  scoped_refptr<TestErrorDelegate> error_delegate(new TestErrorDelegate);
-  db.db_->set_error_delegate(error_delegate);
+  db.db_->set_error_delegate(new TestErrorDelegate());
 
   AppCacheDatabase::EntryRecord entry;
 
   entry.cache_id = 1;
   entry.url = GURL("http://blah/1");
   entry.flags = AppCacheEntry::MASTER;
   entry.response_id = 1;
   entry.response_size = 100;
   EXPECT_TRUE(db.InsertEntry(&entry));
   EXPECT_FALSE(db.InsertEntry(&entry));
@@ skipping 52 matching lines @@
   EXPECT_TRUE(db.DeleteEntriesForCache(1));
   EXPECT_FALSE(db.AddEntryFlags(GURL("http://blah/1"), 1,
                                 AppCacheEntry::FOREIGN));
 }
 
 TEST(AppCacheDatabaseTest, CacheRecords) {
   const FilePath kEmptyPath;
   AppCacheDatabase db(kEmptyPath);
   EXPECT_TRUE(db.LazyOpen(true));
 
-  scoped_refptr<TestErrorDelegate> error_delegate(new TestErrorDelegate);
-  db.db_->set_error_delegate(error_delegate);
+  db.db_->set_error_delegate(new TestErrorDelegate());
 
   const AppCacheDatabase::CacheRecord kZeroRecord;
   AppCacheDatabase::CacheRecord record;
   EXPECT_FALSE(db.FindCache(1, &record));
 
   record.cache_id = 1;
   record.group_id = 1;
   record.online_wildcard = true;
   record.update_time = kZeroTime;
   record.cache_size = 100;
@@ skipping 21 matching lines @@
   EXPECT_FALSE(db.FindCacheForGroup(1, &record));
 
   EXPECT_TRUE(db.DeleteCache(1));
 }
 
 TEST(AppCacheDatabaseTest, GroupRecords) {
   const FilePath kEmptyPath;
   AppCacheDatabase db(kEmptyPath);
   EXPECT_TRUE(db.LazyOpen(true));
 
-  scoped_refptr<TestErrorDelegate> error_delegate(new TestErrorDelegate);
-  db.db_->set_error_delegate(error_delegate);
+  db.db_->set_error_delegate(new TestErrorDelegate());
 
   const GURL kManifestUrl("http://blah/manifest");
   const GURL kOrigin(kManifestUrl.GetOrigin());
   const base::Time kLastAccessTime = base::Time::Now();
   const base::Time kCreationTime =
       kLastAccessTime - base::TimeDelta::FromDays(7);
 
   const AppCacheDatabase::GroupRecord kZeroRecord;
   AppCacheDatabase::GroupRecord record;
   std::vector<AppCacheDatabase::GroupRecord> records;
@@ skipping 106 matching lines @@
   EXPECT_EQ(1, record.group_id);
   EXPECT_EQ(kManifest2, record.manifest_url);
   EXPECT_EQ(kOrigin2, record.origin);
 }
 
 TEST(AppCacheDatabaseTest, NamespaceRecords) {
   const FilePath kEmptyPath;
   AppCacheDatabase db(kEmptyPath);
   EXPECT_TRUE(db.LazyOpen(true));
 
-  scoped_refptr<TestErrorDelegate> error_delegate(new TestErrorDelegate);
-  db.db_->set_error_delegate(error_delegate);
+  db.db_->set_error_delegate(new TestErrorDelegate());
 
   const GURL kFooNameSpace1("http://foo/namespace1");
   const GURL kFooNameSpace2("http://foo/namespace2");
   const GURL kFooFallbackEntry("http://foo/entry");
   const GURL kFooOrigin(kFooNameSpace1.GetOrigin());
   const GURL kBarNameSpace1("http://bar/namespace1");
   const GURL kBarNameSpace2("http://bar/namespace2");
   const GURL kBarFallbackEntry("http://bar/entry");
   const GURL kBarOrigin(kBarNameSpace1.GetOrigin());
 
@@ skipping 79 matching lines @@
   fallbacks.clear();
   EXPECT_TRUE(db.FindNamespacesForOrigin(kBarOrigin, &intercepts, &fallbacks));
   EXPECT_EQ(2U, fallbacks.size());
 }
 
 TEST(AppCacheDatabaseTest, OnlineWhiteListRecords) {
   const FilePath kEmptyPath;
   AppCacheDatabase db(kEmptyPath);
   EXPECT_TRUE(db.LazyOpen(true));
 
-  scoped_refptr<TestErrorDelegate> error_delegate(new TestErrorDelegate);
-  db.db_->set_error_delegate(error_delegate);
+  db.db_->set_error_delegate(new TestErrorDelegate());
 
   const GURL kFooNameSpace1("http://foo/namespace1");
   const GURL kFooNameSpace2("http://foo/namespace2");
   const GURL kBarNameSpace1("http://bar/namespace1");
 
   const AppCacheDatabase::OnlineWhiteListRecord kZeroRecord;
   AppCacheDatabase::OnlineWhiteListRecord record;
   std::vector<AppCacheDatabase::OnlineWhiteListRecord> records;
 
   // Behavior with an empty table
@@ skipping 25 matching lines @@
   records.clear();
   EXPECT_TRUE(db.FindOnlineWhiteListForCache(1, &records));
   EXPECT_TRUE(records.empty());
 }
 
 TEST(AppCacheDatabaseTest, DeletableResponseIds) {
   const FilePath kEmptyPath;
   AppCacheDatabase db(kEmptyPath);
   EXPECT_TRUE(db.LazyOpen(true));
 
-  scoped_refptr<TestErrorDelegate> error_delegate(new TestErrorDelegate);
-  db.db_->set_error_delegate(error_delegate);
+  db.db_->set_error_delegate(new TestErrorDelegate());
 
   std::vector<int64> ids;
 
   EXPECT_TRUE(db.GetDeletableResponseIds(&ids, kint64max, 100));
   EXPECT_TRUE(ids.empty());
   ids.push_back(0);
   EXPECT_TRUE(db.DeleteDeletableResponseIds(ids));
   EXPECT_TRUE(db.InsertDeletableResponseIds(ids));
 
   ids.clear();
@@ skipping 55 matching lines @@
   const GURL kManifestUrl("http://blah/manifest");
   const GURL kManifestUrl2("http://blah/manifest2");
   const GURL kOrigin(kManifestUrl.GetOrigin());
   const GURL kOtherOriginManifestUrl("http://other/manifest");
   const GURL kOtherOrigin(kOtherOriginManifestUrl.GetOrigin());
 
   const FilePath kEmptyPath;
   AppCacheDatabase db(kEmptyPath);
   EXPECT_TRUE(db.LazyOpen(true));
 
-  scoped_refptr<TestErrorDelegate> error_delegate(new TestErrorDelegate);
-  db.db_->set_error_delegate(error_delegate);
+  db.db_->set_error_delegate(new TestErrorDelegate());
 
   std::vector<AppCacheDatabase::CacheRecord> cache_records;
   EXPECT_EQ(0, db.GetOriginUsage(kOrigin));
   EXPECT_TRUE(db.FindCachesForOrigin(kOrigin, &cache_records));
   EXPECT_TRUE(cache_records.empty());
 
   AppCacheDatabase::GroupRecord group_record;
   group_record.group_id = 1;
   group_record.manifest_url = kManifestUrl;
   group_record.origin = kOrigin;
@@ skipping 257 matching lines @@
 
     EXPECT_EQ(i, fallbacks[i].cache_id);
     EXPECT_EQ(FALLBACK_NAMESPACE, fallbacks[i].type);
     EXPECT_EQ(kMockOrigin, fallbacks[i].origin);
     EXPECT_EQ(expected_namespace_url, fallbacks[i].namespace_url);
     EXPECT_EQ(expected_target_url, fallbacks[i].target_url);
   }
 }
 
 }  // namespace appcache