Merge 96554 - A little more WebSQLDatabase thread safety.

Source/WebCore/storage/AbstractDatabase.h

 /*
- * Copyright (C) 2010 Google Inc. All rights reserved.
+ * Copyright (C) 2011 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
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
@@ skipping 84 matching lines @@
     virtual bool performOpenAndVerify(bool shouldSetVersionInNewDatabase, ExceptionCode& ec);
 
     bool getVersionFromDatabase(String& version, bool shouldCacheVersion = true);
     bool setVersionInDatabase(const String& version, bool shouldCacheVersion = true);
     void setExpectedVersion(const String&);
     const String& expectedVersion() const { return m_expectedVersion; }
     String getCachedVersion()const;
     void setCachedVersion(const String&);
     bool getActualVersionForTransaction(String& version);
 
-    static const String& databaseInfoTableName();
+    static const char* databaseInfoTableName();
 
     RefPtr<ScriptExecutionContext> m_scriptExecutionContext;
     RefPtr<SecurityOrigin> m_contextThreadSecurityOrigin;
 
     String m_name;
     String m_expectedVersion;
     String m_displayName;
     unsigned long m_estimatedSize;
     String m_filename;
 
 #if !LOG_DISABLED
     String databaseDebugName() const { return m_contextThreadSecurityOrigin->toString() + "::" + m_name; }
 #endif
 
 private:
-    static const String& databaseVersionKey();
-
     int m_guid;
     bool m_opened;
     bool m_new;
 
     SQLiteDatabase m_sqliteDatabase;
 
     RefPtr<DatabaseAuthorizer> m_databaseAuthorizer;
 };
 
 } // namespace WebCore
 
 #endif // ENABLE(DATABASE)
 
 #endif // AbstractDatabase_h