Merge 120833 - Unreviewed build fix.

Source/WebKit/chromium/tests/IDBDatabaseBackendTest.cpp

 /*
  * Copyright (C) 2012 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 52 matching lines @@
     EXPECT_TRUE(backingStore->hasOneRef());
     store.clear();
     EXPECT_TRUE(backingStore->hasOneRef());
     index.clear();
     EXPECT_TRUE(backingStore->hasOneRef());
 }
 
 class MockIDBCallbacks : public IDBCallbacks {
 public:
     static PassRefPtr<MockIDBCallbacks> create() { return adoptRef(new MockIDBCallbacks()); }
-    virtual ~MockIDBCallbacks() OVERRIDE
+    virtual ~MockIDBCallbacks()
     {
         EXPECT_TRUE(m_wasSuccessDBCalled);
     }
     virtual void onError(PassRefPtr<IDBDatabaseError>) OVERRIDE { }
     virtual void onSuccess(PassRefPtr<DOMStringList>) OVERRIDE { }
     virtual void onSuccess(PassRefPtr<IDBCursorBackendInterface>) OVERRIDE { }
     virtual void onSuccess(PassRefPtr<IDBDatabaseBackendInterface>) OVERRIDE
     {
         m_wasSuccessDBCalled = true;
     }
     virtual void onSuccess(PassRefPtr<IDBKey>) OVERRIDE { }
     virtual void onSuccess(PassRefPtr<IDBTransactionBackendInterface>) OVERRIDE { }
     virtual void onSuccess(PassRefPtr<SerializedScriptValue>) OVERRIDE { }
     virtual void onSuccessWithContinuation() OVERRIDE { }
     virtual void onSuccessWithPrefetch(const Vector<RefPtr<IDBKey> >&, const Vector<RefPtr<IDBKey> >&, const Vector<RefPtr<SerializedScriptValue> >&) OVERRIDE { }
     virtual void onBlocked() OVERRIDE { }
 private:
     MockIDBCallbacks()
         : m_wasSuccessDBCalled(false) { }
     bool m_wasSuccessDBCalled;
 };
 
 class FakeIDBDatabaseCallbacks : public IDBDatabaseCallbacks {
 public:
     static PassRefPtr<FakeIDBDatabaseCallbacks> create() { return adoptRef(new FakeIDBDatabaseCallbacks()); }
-    virtual ~FakeIDBDatabaseCallbacks() OVERRIDE { }
+    virtual ~FakeIDBDatabaseCallbacks() { }
     virtual void onVersionChange(const String& version) OVERRIDE { }
 private:
     FakeIDBDatabaseCallbacks() { }
 };
 
 TEST(IDBDatabaseBackendTest, ConnectionLifecycle)
 {
     RefPtr<IDBFakeBackingStore> backingStore = adoptRef(new IDBFakeBackingStore());
     EXPECT_TRUE(backingStore->hasOneRef());
 
@@ skipping 17 matching lines @@
     RefPtr<FakeIDBDatabaseCallbacks> connection2 = FakeIDBDatabaseCallbacks::create();
     db->registerFrontendCallbacks(connection2);
 
     db->close(connection2);
     EXPECT_TRUE(backingStore->hasOneRef());
 }
 
 } // namespace
 
 #endif // ENABLE(INDEXED_DATABASE)