Merge 46700 - Don't bother returning the directory descriptor for SQLite....

chrome/browser/renderer_host/database_dispatcher_host.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/renderer_host/database_dispatcher_host.h"
 
 #if defined(OS_POSIX)
 #include "base/file_descriptor_posix.h"
 #endif
 
@@ skipping 158 matching lines @@
              !db_tracker_->IsDatabaseScheduledForDeletion(origin_identifier,
                                                           database_name)) {
       FilePath db_file =
           DatabaseUtil::GetFullFilePathForVfsFile(db_tracker_, vfs_file_name);
       if (!db_file.empty()) {
         VfsBackend::OpenFile(db_file, desired_flags, process_handle_,
                              &target_handle, &target_dir_handle);
       }
   }
 
+#if defined(OS_POSIX)
+  if (target_dir_handle >= 0)
+    close(target_dir_handle);
+  target_dir_handle = -1;
+#endif
+
   ViewHostMsg_DatabaseOpenFile::WriteReplyParams(
       reply_msg,
 #if defined(OS_WIN)
       target_handle
 #elif defined(OS_POSIX)
       base::FileDescriptor(target_handle, true),
       base::FileDescriptor(target_dir_handle, true)
 #endif
       );
   Send(reply_msg);
@@ skipping 231 matching lines @@
                                         database_size, space_available));
   }
 }
 
 void DatabaseDispatcherHost::OnDatabaseScheduledForDeletion(
     const string16& origin_identifier,
     const string16& database_name) {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE));
   Send(new ViewMsg_DatabaseCloseImmediately(origin_identifier, database_name));
 }