Index: Source/WebKit/chromium/tests/IDBRequestTest.cpp |
diff --git a/Source/WebKit/chromium/tests/IDBRequestTest.cpp b/Source/WebKit/chromium/tests/IDBRequestTest.cpp |
index b00605c1f5f5af22fef54bb3310fd69eb26eed9b..fed25a9ed130a79dd1d3cdcf4e92c21360546aaa 100644 |
--- a/Source/WebKit/chromium/tests/IDBRequestTest.cpp |
+++ b/Source/WebKit/chromium/tests/IDBRequestTest.cpp |
@@ -122,9 +122,9 @@ TEST_F(IDBRequestTest, AbortErrorAfterAbort) |
class MockIDBDatabaseBackendInterface : public IDBDatabaseBackendInterface { |
public: |
- static PassRefPtr<MockIDBDatabaseBackendInterface> create() |
+ static MockIDBDatabaseBackendInterface* create() |
{ |
- return adoptRef(new MockIDBDatabaseBackendInterface()); |
+ return new MockIDBDatabaseBackendInterface(); |
} |
virtual ~MockIDBDatabaseBackendInterface() |
{ |
@@ -133,8 +133,8 @@ public: |
virtual void createObjectStore(int64_t transactionId, int64_t objectStoreId, const String& name, const IDBKeyPath&, bool autoIncrement) OVERRIDE { } |
virtual void deleteObjectStore(int64_t transactionId, int64_t objectStoreId) OVERRIDE { } |
- virtual void createTransaction(int64_t transactionId, PassRefPtr<IDBDatabaseCallbacks>, const Vector<int64_t>& objectStoreIds, unsigned short mode) OVERRIDE { } |
- virtual void close(PassRefPtr<IDBDatabaseCallbacks>) OVERRIDE |
+ virtual void createTransaction(int64_t transactionId, IDBDatabaseCallbacks*, const Vector<int64_t>& objectStoreIds, unsigned short mode) OVERRIDE { } |
+ virtual void close(IDBDatabaseCallbacks*) OVERRIDE |
{ |
m_closeCalled = true; |
} |
@@ -146,14 +146,16 @@ public: |
virtual void createIndex(int64_t transactionId, int64_t objectStoreId, int64_t indexId, const String& name, const IDBKeyPath&, bool unique, bool multiEntry) OVERRIDE { } |
virtual void deleteIndex(int64_t transactionId, int64_t objectStoreId, int64_t indexId) OVERRIDE { } |
- virtual void get(int64_t transactionId, int64_t objectStoreId, int64_t indexId, PassRefPtr<IDBKeyRange>, bool keyOnly, PassRefPtr<IDBCallbacks>) OVERRIDE { } |
- virtual void put(int64_t transactionId, int64_t objectStoreId, PassRefPtr<SharedBuffer> value, PassRefPtr<IDBKey>, PutMode, PassRefPtr<IDBCallbacks>, const Vector<int64_t>& indexIds, const Vector<IndexKeys>&) OVERRIDE { } |
+ virtual void get(int64_t transactionId, int64_t objectStoreId, int64_t indexId, PassRefPtr<IDBKeyRange>, bool keyOnly, IDBCallbacks*) OVERRIDE { } |
+ virtual void put(int64_t transactionId, int64_t objectStoreId, PassRefPtr<SharedBuffer> value, PassRefPtr<IDBKey>, PutMode, IDBCallbacks*, const Vector<int64_t>& indexIds, const Vector<IndexKeys>&) OVERRIDE { } |
virtual void setIndexKeys(int64_t transactionId, int64_t objectStoreId, PassRefPtr<IDBKey>, const Vector<int64_t>& indexIds, const Vector<IndexKeys>&) OVERRIDE { } |
virtual void setIndexesReady(int64_t transactionId, int64_t objectStoreId, const Vector<int64_t>& indexIds) OVERRIDE { } |
- virtual void openCursor(int64_t transactionId, int64_t objectStoreId, int64_t indexId, PassRefPtr<IDBKeyRange>, IndexedDB::CursorDirection, bool keyOnly, TaskType, PassRefPtr<IDBCallbacks>) OVERRIDE { } |
- virtual void count(int64_t transactionId, int64_t objectStoreId, int64_t indexId, PassRefPtr<IDBKeyRange>, PassRefPtr<IDBCallbacks>) OVERRIDE { } |
- virtual void deleteRange(int64_t transactionId, int64_t objectStoreId, PassRefPtr<IDBKeyRange>, PassRefPtr<IDBCallbacks>) OVERRIDE { } |
- virtual void clear(int64_t transactionId, int64_t objectStoreId, PassRefPtr<IDBCallbacks>) OVERRIDE { } |
+ virtual void openCursor(int64_t transactionId, int64_t objectStoreId, int64_t indexId, PassRefPtr<IDBKeyRange>, IndexedDB::CursorDirection, bool keyOnly, TaskType, IDBCallbacks*) OVERRIDE { } |
+ virtual void count(int64_t transactionId, int64_t objectStoreId, int64_t indexId, PassRefPtr<IDBKeyRange>, IDBCallbacks*) OVERRIDE { } |
+ virtual void deleteRange(int64_t transactionId, int64_t objectStoreId, PassRefPtr<IDBKeyRange>, IDBCallbacks*) OVERRIDE { } |
+ virtual void clear(int64_t transactionId, int64_t objectStoreId, IDBCallbacks*) OVERRIDE { } |
+ |
+ virtual void trace(Visitor*) OVERRIDE { } |
private: |
MockIDBDatabaseBackendInterface() |
@@ -173,10 +175,10 @@ TEST_F(IDBRequestTest, ConnectionsAfterStopping) |
const int64_t version = 1; |
const int64_t oldVersion = 0; |
const IDBDatabaseMetadata metadata; |
- RefPtr<IDBDatabaseCallbacksImpl> callbacks = IDBDatabaseCallbacksImpl::create(); |
+ IDBDatabaseCallbacksImpl* callbacks = IDBDatabaseCallbacksImpl::create(); |
{ |
- RefPtr<MockIDBDatabaseBackendInterface> interface = MockIDBDatabaseBackendInterface::create(); |
+ MockIDBDatabaseBackendInterface* interface = MockIDBDatabaseBackendInterface::create(); |
RefPtr<IDBOpenDBRequest> request = IDBOpenDBRequest::create(scriptExecutionContext(), callbacks, transactionId, version); |
EXPECT_EQ(request->readyState(), "pending"); |
@@ -185,7 +187,7 @@ TEST_F(IDBRequestTest, ConnectionsAfterStopping) |
} |
{ |
- RefPtr<MockIDBDatabaseBackendInterface> interface = MockIDBDatabaseBackendInterface::create(); |
+ MockIDBDatabaseBackendInterface* interface = MockIDBDatabaseBackendInterface::create(); |
RefPtr<IDBOpenDBRequest> request = IDBOpenDBRequest::create(scriptExecutionContext(), callbacks, transactionId, version); |
EXPECT_EQ(request->readyState(), "pending"); |