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

Source/WebCore/storage/SQLTransactionSync.h

 /*
  * Copyright (C) 2010 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 16 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef SQLTransactionSync_h
 #define SQLTransactionSync_h
 
 #if ENABLE(DATABASE)
 
 #include "ExceptionCode.h"
+#include "PlatformString.h"
 #include <wtf/Forward.h>
 #include <wtf/RefCounted.h>
 #include <wtf/Vector.h>
 
 namespace WebCore {
 
 class DatabaseSync;
 class SQLResultSet;
 class SQLTransactionClient;
 class SQLTransactionSyncCallback;
@@ skipping 16 matching lines @@
     ExceptionCode execute();
     ExceptionCode commit();
     void rollback();
 
 private:
     SQLTransactionSync(DatabaseSync*, PassRefPtr<SQLTransactionSyncCallback>, bool readOnly);
 
     RefPtr<DatabaseSync> m_database;
     RefPtr<SQLTransactionSyncCallback> m_callback;
     bool m_readOnly;
+    bool m_hasVersionMismatch;
 
     bool m_modifiedDatabase;
     OwnPtr<SQLTransactionClient> m_transactionClient;
     OwnPtr<SQLiteTransaction> m_sqliteTransaction;
 };
 
 } // namespace WebCore
 
 #endif
 
 #endif // SQLTransactionSync_h