3 files changed, 3 insertions, 30 deletions
diff --git a/chrome/common/database_util.cc b/chrome/common/database_util.cc
index fe196c6..7af72c0 100644
--- a/chrome/common/database_util.cc
+++ b/chrome/common/database_util.cc
@@ -20,25 +20,15 @@ using WebKit::WebString;
 
 WebKitClient::FileHandle DatabaseUtil::databaseOpenFile(
     const WebString& vfs_file_name, int desired_flags) {
-  IPC::PlatformFileForTransit file_handle;
-#if defined(OS_WIN)
-  file_handle = base::kInvalidPlatformFileValue;
-#elif defined(OS_POSIX)
-  file_handle =
-      base::FileDescriptor(base::kInvalidPlatformFileValue, true);
-#endif
+  IPC::PlatformFileForTransit file_handle =
+      IPC::InvalidPlatformFileForTransit();
 
   scoped_refptr<IPC::SyncMessageFilter> filter =
       ChildThread::current()->sync_message_filter();
-
   filter->Send(new ViewHostMsg_DatabaseOpenFile(
       vfs_file_name, desired_flags, &file_handle));
 
-#if defined(OS_WIN)
-  return file_handle;
-#elif defined(OS_POSIX)
-  return file_handle.fd;
-#endif
+  return IPC::PlatformFileForTransitToPlatformFile(file_handle);
 }
 
 int DatabaseUtil::databaseDeleteFile(
diff --git a/webkit/glue/webkitclient_impl.cc b/webkit/glue/webkitclient_impl.cc
index 29b812a..94b5692 100644
--- a/webkit/glue/webkitclient_impl.cc
+++ b/webkit/glue/webkitclient_impl.cc
@@ -333,16 +333,6 @@ void WebKitClientImpl::callOnMainThread(void (*func)(void*), void* context) {
   main_loop_->PostTask(FROM_HERE, NewRunnableFunction(func, context));
 }
 
-// TODO: remove this method once https://bugs.webkit.org/show_bug.cgi?id=38869
-// is resolved.
-base::PlatformFile WebKitClientImpl::databaseOpenFile(
-    const WebKit::WebString& vfs_file_name, int desired_flags,
-    base::PlatformFile* dir_handle) {
-  if (dir_handle)
-    *dir_handle = base::kInvalidPlatformFileValue;
-  return databaseOpenFile(vfs_file_name, desired_flags);
-}
-
 base::PlatformFile WebKitClientImpl::databaseOpenFile(
     const WebKit::WebString& vfs_file_name, int desired_flags) {
   return base::kInvalidPlatformFileValue;
diff --git a/webkit/glue/webkitclient_impl.h b/webkit/glue/webkitclient_impl.h
index 0f70841..bec7a79 100644
--- a/webkit/glue/webkitclient_impl.h
+++ b/webkit/glue/webkitclient_impl.h
@@ -24,13 +24,6 @@ class WebKitClientImpl : public WebKit::WebKitClient {
   // WebKitClient methods (partial implementation):
   virtual WebKit::WebThemeEngine* themeEngine();
 
-  // TODO: remove this method once https://bugs.webkit.org/show_bug.cgi?id=38869
-  // is resolved.
-  virtual base::PlatformFile databaseOpenFile(
-      const WebKit::WebString& vfs_file_name,
-      int desired_flags,
-      base::PlatformFile* dir_handle);
-
   virtual base::PlatformFile databaseOpenFile(
       const WebKit::WebString& vfs_file_name, int desired_flags);
   virtual int databaseDeleteFile(const WebKit::WebString& vfs_file_name,