Use __func__ instead of __FUNCTION__.

chrome/installer/util/delete_after_reboot_helper.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.
 //
 // This file defines helper methods used to schedule files for deletion
 // on next reboot. The code here is heavily borrowed and simplified from
 //  http://code.google.com/p/omaha/source/browse/trunk/common/file.cc and
 //  http://code.google.com/p/omaha/source/browse/trunk/common/utils.cc
 //
 // This implementation really is not fast, so do not use it where that will
@@ skipping 232 matching lines @@
   }
   *write_pointer = L'\0';  // Explicitly set the final null char.
   DCHECK(++write_pointer == end_pointer);
 }
 
 base::FilePath GetShortPathName(const base::FilePath& path) {
   std::wstring short_path;
   DWORD length = GetShortPathName(path.value().c_str(),
                                   base::WriteInto(&short_path, MAX_PATH),
                                   MAX_PATH);
   DWORD last_error = ::GetLastError();

[grt (UTC plus 2), 2016/07/20 06:18:51]

while you're at it, could you remove this line and change the one below to:
  DPLOG_IF(...) << __func__;
this will result in a human-readable error message in the log

[Peter Kasting, 2016/07/20 06:27:22]

That last error value is used in the condition for the DLOG.  Does calling
GetLastError() reset the error code?  If so, the change you suggest wouldn't be
safe.  Otherwise I suppose we could do:

  DPLOG_IF(WARNING, length == 0 && GetLastError() != ERROR_PATH_NOT_FOUND)
      << __func__;

(Although personally I wish this would do DVPLOG_IF(1, ...) instead of using
DPLOG().)

[grt (UTC plus 2), 2016/07/20 06:32:47]

Ah, I just saw "DLOG" and "gle" in the message without looking too closely.
Apologies.
No.
I think that's safe. Feel free to leave this out if you prefer not to make a
behavior change with this substitution.

[Peter Kasting, 2016/07/20 06:35:51]

I don't mind at all, it's more convenient than doing it in a separate CL.

   DLOG_IF(WARNING, length == 0 && last_error != ERROR_PATH_NOT_FOUND)
-      << __FUNCTION__ << " gle=" << last_error;
+      << __func__ << " gle=" << last_error;
   if ((length == 0) || (length > MAX_PATH)) {
     // GetShortPathName fails if the path is no longer present or cannot be
     // put in the size buffer provided.  Instead of returning an empty string,
     // just return the original string.  This will serve our purposes.
     return path;
   }
 
   short_path.resize(length);
   return base::FilePath(short_path);
 }
@@ skipping 131 matching lines @@
         ERROR_SUCCESS);
   }
   std::vector<char> buffer;
   StringArrayToMultiSZBytes(strings_to_keep, &buffer);
   DCHECK_GT(buffer.size(), 0U);
   if (buffer.empty())
     return false;
   return (session_manager_key.WriteValue(kPendingFileRenameOps, &buffer[0],
       buffer.size(), REG_MULTI_SZ) == ERROR_SUCCESS);
 }