Refactor AppendToFile and WriteFileDescriptor

chrome/browser/shell_integration_linux.cc

 // Copyright (c) 2012 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/shell_integration_linux.h"
 
 #include <fcntl.h>
 
 #if defined(USE_GLIB)
 #include <glib.h>
@@ skipping 145 matching lines @@
 
   int fd = openat(desktop_fd, shortcut_filename.value().c_str(),
                   O_CREAT | O_EXCL | O_WRONLY,
                   S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH);
   if (fd < 0) {
     if (IGNORE_EINTR(close(desktop_fd)) < 0)
       PLOG(ERROR) << "close";
     return false;
   }
 
-  ssize_t bytes_written = base::WriteFileDescriptor(fd, contents.data(),
-                                                    contents.length());
-  if (IGNORE_EINTR(close(fd)) < 0)
-    PLOG(ERROR) << "close";
-
-  if (bytes_written != static_cast<ssize_t>(contents.length())) {
+  if (!base::WriteFileDescriptor(fd, contents.c_str(), contents.size())) {
     // Delete the file. No shortuct is better than corrupted one. Use unlinkat
     // to make sure we're deleting the file in the directory we think we are.
     // Even if an attacker manager to put something other at
     // |shortcut_filename| we'll just undo his action.
     unlinkat(desktop_fd, shortcut_filename.value().c_str(), 0);
   }
 
+  if (IGNORE_EINTR(close(fd)) < 0)
+    PLOG(ERROR) << "close";
+
   if (IGNORE_EINTR(close(desktop_fd)) < 0)
     PLOG(ERROR) << "close";
 
   return true;
 }
 
 void DeleteShortcutOnDesktop(const base::FilePath& shortcut_filename) {
   base::FilePath desktop_path;
   if (PathService::Get(base::DIR_USER_DESKTOP, &desktop_path))
     base::DeleteFile(desktop_path.Append(shortcut_filename), false);
@@ skipping 885 matching lines @@
     for (std::vector<base::FilePath>::const_iterator it =
          shortcut_filenames_app_menu.begin();
          it != shortcut_filenames_app_menu.end(); ++it) {
       DeleteShortcutInApplicationsMenu(*it,
                                        base::FilePath(kDirectoryFilename));
     }
   }
 }
 
 }  // namespace shell_integration_linux