Merge 92155 - [Chromium] WebSQLDatabase version handling is broken in multi-process browsers.

Source/WebCore/storage/DatabaseSync.cpp

Index: Source/WebCore/storage/DatabaseSync.cpp
===================================================================
--- Source/WebCore/storage/DatabaseSync.cpp	(revision 92303)
+++ Source/WebCore/storage/DatabaseSync.cpp	(working copy)
@@ -67,7 +67,6 @@
     DatabaseTracker::tracker().setDatabaseDetails(context->securityOrigin(), name, displayName, estimatedSize);
 
     if (database->isNew() && creationCallback.get()) {
-        database->m_expectedVersion = "";
         LOG(StorageAPI, "Invoking the creation callback for database %p\n", database.get());
         creationCallback->handleEvent(database.get());
     }
@@ -123,8 +122,10 @@
         return;
     }
 
-    if ((ec = transaction->commit()))
+    if ((ec = transaction->commit())) {
+        setCachedVersion(oldVersion);
         return;
+    }
 
     setExpectedVersion(newVersion);
 }