Fix test failures of IDBTransactionTest.EnsureLifetime with ENABLE(OILPAN)

Source/modules/indexeddb/IDBTransactionTest.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 33 matching lines @@
 using namespace WebCore;
 
 using blink::WebIDBDatabase;
 
 namespace {
 
 class IDBTransactionTest : public testing::Test {
 public:
     IDBTransactionTest()
         : m_scope(v8::Isolate::GetCurrent())
+        , m_executionContext(Document::create())
     {
-        m_scope.scriptState()->setExecutionContext(Document::create());
+        m_scope.scriptState()->setExecutionContext(m_executionContext.get());
+    }
+
+    ~IDBTransactionTest()
+    {
+        m_scope.scriptState()->setExecutionContext(0);
     }
 
     v8::Isolate* isolate() const { return m_scope.isolate(); }
     ScriptState* scriptState() const { return m_scope.scriptState(); }
     ExecutionContext* executionContext() { return m_scope.scriptState()->executionContext(); }
 
 private:
     V8TestingScope m_scope;
+    RefPtr<ExecutionContext> m_executionContext;
 };
 
 class FakeWebIDBDatabase FINAL : public blink::WebIDBDatabase {
 public:
     static PassOwnPtr<FakeWebIDBDatabase> create() { return adoptPtr(new FakeWebIDBDatabase()); }
 
     virtual void commit(long long transactionId) OVERRIDE { }
     virtual void abort(long long transactionId) OVERRIDE { }
     virtual void close() OVERRIDE { }
 
 private:
     FakeWebIDBDatabase() { }
 };
 
 class FakeIDBDatabaseCallbacks FINAL : public IDBDatabaseCallbacks {
 public:
     static FakeIDBDatabaseCallbacks* create() { return new FakeIDBDatabaseCallbacks(); }
     virtual void onVersionChange(int64_t oldVersion, int64_t newVersion) OVERRIDE { }
     virtual void onForcedClose() OVERRIDE { }
     virtual void onAbort(int64_t transactionId, PassRefPtrWillBeRawPtr<DOMError> error) OVERRIDE { }
     virtual void onComplete(int64_t transactionId) OVERRIDE { }
 private:
     FakeIDBDatabaseCallbacks() { }
 };
 
-// crbug.com/379616
-#if ENABLE(OILPAN)
-#define MAYBE_EnsureLifetime DISABLED_EnsureLifetime
-#else
-#define MAYBE_EnsureLifetime EnsureLifetime
-#endif
-TEST_F(IDBTransactionTest, MAYBE_EnsureLifetime)
+TEST_F(IDBTransactionTest, EnsureLifetime)
 {
     OwnPtr<FakeWebIDBDatabase> backend = FakeWebIDBDatabase::create();
     Persistent<IDBDatabase> db = IDBDatabase::create(executionContext(), backend.release(), FakeIDBDatabaseCallbacks::create());
 
     const int64_t transactionId = 1234;
     const Vector<String> transactionScope;
     Persistent<IDBTransaction> transaction = IDBTransaction::create(executionContext(), transactionId, transactionScope, blink::WebIDBDatabase::TransactionReadOnly, db.get());
     PersistentHeapHashSet<WeakMember<IDBTransaction> > set;
     set.add(transaction);
 
@@ skipping 46 matching lines @@
     // Fire an abort to make sure this doesn't free the transaction during use. The test
     // will not fail if it is, but ASAN would notice the error.
     db->onAbort(transactionId, DOMError::create(AbortError, "Aborted"));
 
     // onAbort() should have cleared the transaction's reference to the database.
     Heap::collectAllGarbage();
     EXPECT_EQ(0u, set.size());
 }
 
 } // namespace