Fix IndexedDB race condition during shutdown.

chrome/browser/in_process_webkit/browser_webkitclient_impl.cc

Index: chrome/browser/in_process_webkit/browser_webkitclient_impl.cc
diff --git a/chrome/browser/in_process_webkit/browser_webkitclient_impl.cc b/chrome/browser/in_process_webkit/browser_webkitclient_impl.cc
index c1a34f36fc01ac8cf0117f9022c4c83a048750a7..5c75a7945c0cb3b37ee529f3b43ab090efc3ba29 100644
--- a/chrome/browser/in_process_webkit/browser_webkitclient_impl.cc
+++ b/chrome/browser/in_process_webkit/browser_webkitclient_impl.cc
@@ -147,21 +147,10 @@ int BrowserWebKitClientImpl::databaseDeleteFile(
   return file_util::Delete(path, false) ? 0 : 1;
 }
 
-void BrowserWebKitClientImpl::idbShutdown() {
-  if (indexed_db_key_utility_client_.get()) {
-    indexed_db_key_utility_client_->EndUtilityProcess();
-    indexed_db_key_utility_client_ = NULL;
-  }
-}
-
 void BrowserWebKitClientImpl::createIDBKeysFromSerializedValuesAndKeyPath(
     const WebKit::WebVector<WebKit::WebSerializedScriptValue>& values,
     const WebKit::WebString& keyPath,
     WebKit::WebVector<WebKit::WebIDBKey>& keys) {
-  if (!indexed_db_key_utility_client_.get()) {
-    indexed_db_key_utility_client_ = new IndexedDBKeyUtilityClient();
-    indexed_db_key_utility_client_->StartUtilityProcess();
-  }
 
   std::vector<SerializedScriptValue> std_values;
   size_t size = values.size();
@@ -170,8 +159,10 @@ void BrowserWebKitClientImpl::createIDBKeysFromSerializedValuesAndKeyPath(
     std_values.push_back(SerializedScriptValue(values[i]));
 
   std::vector<IndexedDBKey> std_keys;
-  indexed_db_key_utility_client_->CreateIDBKeysFromSerializedValuesAndKeyPath(
-      std_values, keyPath, &std_keys);
+  IndexedDBKeyUtilityClient::
+      GetInstance()->CreateIDBKeysFromSerializedValuesAndKeyPath(std_values,

[jorlow1, 2011/01/21 09:33:00]

Isn't this what
IndexedDBKeyUtilityClient::CreateIDBKeysFromSerializedValuesAndKeyPath is for?

Should you even have a GetInstance()?  It seems too easy to shoot yourself in
the foot.

[hans, 2011/01/21 11:27:55]

You're right. Removing GetInstance() and making the public members static.

After discussing with Satish, this means we probably want to use LazyInstance<>
rather than Singleton<>.

+                                                                 keyPath,
+                                                                 &std_keys);
 
   keys = std_keys;
 }