Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(52)

Unified Diff: sql/mojo/mojo_vfs.cc

Issue 1272373004: Fix Mandoline apptests on Windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ' Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | sql/mojo/vfs_unittest.cc » ('j') | sql/mojo/vfs_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sql/mojo/mojo_vfs.cc
diff --git a/sql/mojo/mojo_vfs.cc b/sql/mojo/mojo_vfs.cc
index 111bd62c5c83e0033b2359dd8bf7ba7cab695ed2..8fc6da73b837a40e8d50a8324dbba70d5f86238e 100644
--- a/sql/mojo/mojo_vfs.cc
+++ b/sql/mojo/mojo_vfs.cc
@@ -61,6 +61,11 @@ filesystem::FilePtr& GetFSFile(sqlite3_file* vfs_file) {
int MojoVFSClose(sqlite3_file* file) {
DVLOG(1) << "MojoVFSClose(*)";
using filesystem::FilePtr;
+ filesystem::FileError error = filesystem::FILE_ERROR_FAILED;
+ // Must call File::Close explicitly instead of just deleting the file, since
+ // otherwise we wouldn't have an object to wait on.
+ GetFSFile(file)->Close(mojo::Capture(&error));
+ GetFSFile(file).WaitForIncomingResponse();
GetFSFile(file).~FilePtr();
return SQLITE_OK;
}
« no previous file with comments | « no previous file | sql/mojo/vfs_unittest.cc » ('j') | sql/mojo/vfs_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698