summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authordcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-19 20:52:56 +0000
committerdcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-19 20:52:56 +0000
commit476bd31a77b4615dd4dbbd9de8ebb05ee8820ba3 (patch)
treec816d067f3296ea111d77b8349a29f4308f87275 /webkit
parent8886b551a96d0d0f8546eefe8ce36cd027d7982b (diff)
downloadchromium_src-476bd31a77b4615dd4dbbd9de8ebb05ee8820ba3.zip
chromium_src-476bd31a77b4615dd4dbbd9de8ebb05ee8820ba3.tar.gz
chromium_src-476bd31a77b4615dd4dbbd9de8ebb05ee8820ba3.tar.bz2
Fix some errors when building in gcc 4.6
BUG=none TEST=compiles Review URL: https://chromiumcodereview.appspot.com/10559011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143046 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/fileapi/file_system_directory_database_unittest.cc7
1 files changed, 1 insertions, 6 deletions
diff --git a/webkit/fileapi/file_system_directory_database_unittest.cc b/webkit/fileapi/file_system_directory_database_unittest.cc
index 55fe68c..fc52bc6 100644
--- a/webkit/fileapi/file_system_directory_database_unittest.cc
+++ b/webkit/fileapi/file_system_directory_database_unittest.cc
@@ -61,15 +61,10 @@ class FileSystemDirectoryDatabaseTest : public testing::Test {
void CreateDirectory(FileId parent_id,
const FilePath::StringType& name,
FileId* file_id_out) {
- FileId file_id;
-
FileInfo info;
info.parent_id = parent_id;
info.name = name;
- ASSERT_TRUE(db_->AddFileInfo(info, &file_id));
-
- if (file_id_out)
- *file_id_out = file_id;
+ ASSERT_TRUE(db_->AddFileInfo(info, file_id_out));
}
void CreateFile(FileId parent_id,