Merge 96554 - A little more WebSQLDatabase thread safety.

Source/WebCore/storage/AbstractDatabase.h

Index: Source/WebCore/storage/AbstractDatabase.h
===================================================================
--- Source/WebCore/storage/AbstractDatabase.h	(revision 96741)
+++ Source/WebCore/storage/AbstractDatabase.h	(working copy)
@@ -1,5 +1,5 @@
 /*
- * 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
@@ -104,7 +104,7 @@
     void setCachedVersion(const String&);
     bool getActualVersionForTransaction(String& version);
 
-    static const String& databaseInfoTableName();
+    static const char* databaseInfoTableName();
 
     RefPtr<ScriptExecutionContext> m_scriptExecutionContext;
     RefPtr<SecurityOrigin> m_contextThreadSecurityOrigin;
@@ -120,8 +120,6 @@
 #endif
 
 private:
-    static const String& databaseVersionKey();
-
     int m_guid;
     bool m_opened;
     bool m_new;