1 files changed, 10 insertions, 47 deletions
diff --git a/chrome/renderer/renderer_webkitclient_impl.cc b/chrome/renderer/renderer_webkitclient_impl.cc
index 33698c5..bbe6786 100644
--- a/chrome/renderer/renderer_webkitclient_impl.cc
+++ b/chrome/renderer/renderer_webkitclient_impl.cc
@@ -15,6 +15,7 @@
 #include "base/platform_file.h"
 #include "chrome/common/appcache/appcache_dispatcher.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/common/database_util.h"
 #include "chrome/common/db_message_filter.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/webmessageportchannel_impl.h"
@@ -272,63 +273,25 @@ void RendererWebKitClientImpl::SandboxSupport::getRenderStyleForStrike(
 //------------------------------------------------------------------------------
 
 WebKitClient::FileHandle RendererWebKitClientImpl::databaseOpenFile(
-  const WebString& vfs_file_name, int desired_flags,
+    const WebString& vfs_file_name, int desired_flags,
   WebKitClient::FileHandle* dir_handle) {
-  DBMessageFilter* db_message_filter = DBMessageFilter::GetInstance();
-  int message_id = db_message_filter->GetUniqueID();
-
-  ViewMsg_DatabaseOpenFileResponse_Params default_response =
-#if defined(OS_WIN)
-      { base::kInvalidPlatformFileValue };
-#elif defined(OS_POSIX)
-      { base::FileDescriptor(base::kInvalidPlatformFileValue, true),
-        base::FileDescriptor(base::kInvalidPlatformFileValue, true) };
-#endif
-
-  ViewMsg_DatabaseOpenFileResponse_Params result =
-      db_message_filter->SendAndWait(
-          new ViewHostMsg_DatabaseOpenFile(
-              vfs_file_name, desired_flags, message_id),
-          message_id, default_response);
-
-#if defined(OS_WIN)
-  if (dir_handle) {
-    *dir_handle = base::kInvalidPlatformFileValue;
-  }
-  return result.file_handle;
-#elif defined(OS_POSIX)
-  if (dir_handle) {
-    *dir_handle = result.dir_handle.fd;
-  }
-  return result.file_handle.fd;
-#endif
+  return DatabaseUtil::databaseOpenFile(vfs_file_name, desired_flags,
+      dir_handle);
 }
 
 int RendererWebKitClientImpl::databaseDeleteFile(
-  const WebString& vfs_file_name, bool sync_dir) {
-  DBMessageFilter* db_message_filter = DBMessageFilter::GetInstance();
-  int message_id = db_message_filter->GetUniqueID();
-  return db_message_filter->SendAndWait(
-      new ViewHostMsg_DatabaseDeleteFile(vfs_file_name, sync_dir, message_id),
-      message_id, SQLITE_IOERR_DELETE);
+    const WebString& vfs_file_name, bool sync_dir) {
+  return DatabaseUtil::databaseDeleteFile(vfs_file_name, sync_dir);
 }
 
 long RendererWebKitClientImpl::databaseGetFileAttributes(
-  const WebString& vfs_file_name) {
-  DBMessageFilter* db_message_filter = DBMessageFilter::GetInstance();
-  int message_id = db_message_filter->GetUniqueID();
-  return db_message_filter->SendAndWait(
-      new ViewHostMsg_DatabaseGetFileAttributes(vfs_file_name, message_id),
-      message_id, -1L);
+    const WebString& vfs_file_name) {
+  return DatabaseUtil::databaseGetFileAttributes(vfs_file_name);
 }
 
 long long RendererWebKitClientImpl::databaseGetFileSize(
-  const WebString& vfs_file_name) {
-  DBMessageFilter* db_message_filter = DBMessageFilter::GetInstance();
-  int message_id = db_message_filter->GetUniqueID();
-  return db_message_filter->SendAndWait(
-      new ViewHostMsg_DatabaseGetFileSize(vfs_file_name, message_id),
-      message_id, 0LL);
+    const WebString& vfs_file_name) {
+  return DatabaseUtil::databaseGetFileSize(vfs_file_name);
 }
 
 WebKit::WebSharedWorkerRepository*