[Zucchini]: Cleanup some issues found when merging to trunk.

A few simple changes/typos that require correction which were detected
when merging changes into trunk.

Change-Id: Ib088ca4a1741e642e3d912d010e4e77ba5fb72b0
Reviewed-on: https://chromium-review.googlesource.com/962357
Commit-Queue: Calder Kitagawa <ckitagawa@google.com>
Reviewed-by: Samuel Huang <huangs@chromium.org>
Cr-Commit-Position: refs/heads/master@{#543155}
NOKEYCHECK=True
GitOrigin-RevId: 3135d7d1cb10ef7d7f94da864643da26ed5a9c84

1 files changed, 7 insertions, 6 deletions

diff --git a/zucchini_integration.cc b/zucchini_integration.cc
index 3ca4601..2d78fdd 100644
--- a/zucchini_integration.cc
+++ b/zucchini_integration.cc
@@ -17,8 +17,7 @@ namespace {
 
 struct FileNames {
   FileNames() : is_dummy(true) {
-    // Use fake names. If |is_dummy| is true these files are only used for error
-    // output.
+    // Use fake names.
     old_name = old_name.AppendASCII("old_name");
     patch_name = patch_name.AppendASCII("patch_name");
     new_name = new_name.AppendASCII("new_name");
@@ -35,6 +34,8 @@ struct FileNames {
   base::FilePath old_name;
   base::FilePath patch_name;
   base::FilePath new_name;
+
+  // A flag to decide whether the filenames are only for error output.
   const bool is_dummy;
 };
 
@@ -97,10 +98,10 @@ status::Code ApplyCommon(base::File&& old_file_handle,
 
 }  // namespace
 
-status::Code Apply(base::File old_file_handle,
-                   base::File patch_file_handle,
-                   base::File new_file_handle) {
-  const FileNames file_names = FileNames();
+status::Code Apply(base::File&& old_file_handle,
+                   base::File&& patch_file_handle,
+                   base::File&& new_file_handle) {
+  const FileNames file_names;
   return ApplyCommon(std::move(old_file_handle), std::move(patch_file_handle),
                      std::move(new_file_handle), file_names);
 }