Fix IndexedDB race condition during shutdown.

chrome/browser/in_process_webkit/browser_webkitclient_impl.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/in_process_webkit/browser_webkitclient_impl.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "chrome/browser/in_process_webkit/dom_storage_message_filter.h"
 #include "chrome/browser/in_process_webkit/indexed_db_key_utility_client.h"
@@ skipping 129 matching lines @@
     NOTREACHED();
     return NULL;
 }
 
 int BrowserWebKitClientImpl::databaseDeleteFile(
     const WebKit::WebString& vfs_file_name, bool sync_dir) {
   const FilePath path = webkit_glue::WebStringToFilePath(vfs_file_name);
   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();
   std_values.reserve(size);
   for (size_t i = 0; i < size; ++i)
     std_values.push_back(SerializedScriptValue(values[i]));
 
   std::vector<IndexedDBKey> std_keys;
-  indexed_db_key_utility_client_->CreateIDBKeysFromSerializedValuesAndKeyPath(
-      std_values, keyPath, &std_keys);
+  IndexedDBKeyUtilityClient::
+      CreateIDBKeysFromSerializedValuesAndKeyPath(std_values, keyPath,
+                                                  &std_keys);
 
   keys = std_keys;
 }