Revert of Revert some other possible suspects of a 0.43% size increase of setup.exe: https://build.chromium.o…

base/files/file.cc

 // Copyright (c) 2011 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 "base/files/file.h"
 #include "base/files/file_path.h"
+#include "base/files/file_tracing.h"
 #include "base/metrics/histogram.h"
 #include "base/timer/elapsed_timer.h"
 
 namespace base {
 
 File::Info::Info()
     : size(0),
       is_directory(false),
       is_symbolic_link(false) {
 }
 
 File::Info::~Info() {
 }
 
 File::File()
     : error_details_(FILE_ERROR_FAILED),
       created_(false),
       async_(false) {
 }
 
 #if !defined(OS_NACL)
-File::File(const FilePath& name, uint32 flags)
+File::File(const FilePath& path, uint32 flags)
     : error_details_(FILE_OK),
       created_(false),
       async_(false) {
-  Initialize(name, flags);
+  Initialize(path, flags);
 }
 #endif
 
 File::File(PlatformFile platform_file)
     : file_(platform_file),
       error_details_(FILE_OK),
       created_(false),
       async_(false) {
 #if defined(OS_POSIX)
   DCHECK_GE(platform_file, -1);
 #endif
 }
 
 File::File(Error error_details)
     : error_details_(error_details),
       created_(false),
       async_(false) {
 }
 
 File::File(RValue other)
     : file_(other.object->TakePlatformFile()),
+      path_(other.object->path_),
       error_details_(other.object->error_details()),
       created_(other.object->created()),
       async_(other.object->async_) {
 }
 
 File::~File() {
   // Go through the AssertIOAllowed logic.
   Close();
 }
 
 File& File::operator=(RValue other) {
   if (this != other.object) {
     Close();
     SetPlatformFile(other.object->TakePlatformFile());
+    path_ = other.object->path_;
     error_details_ = other.object->error_details();
     created_ = other.object->created();
     async_ = other.object->async_;
   }
   return *this;
 }
 
 #if !defined(OS_NACL)
-void File::Initialize(const FilePath& name, uint32 flags) {
-  if (name.ReferencesParent()) {
+void File::Initialize(const FilePath& path, uint32 flags) {
+  if (path.ReferencesParent()) {
     error_details_ = FILE_ERROR_ACCESS_DENIED;
     return;
   }
-  DoInitialize(name, flags);
+  path_ = path;
+  SCOPED_FILE_TRACE("Initialize");
+  DoInitialize(flags);
 }
 #endif
 
 std::string File::ErrorToString(Error error) {
   switch (error) {
     case FILE_OK:
       return "FILE_OK";
     case FILE_ERROR_FAILED:
       return "FILE_ERROR_FAILED";
     case FILE_ERROR_IN_USE:
@@ skipping 29 matching lines @@
     case FILE_ERROR_MAX:
       break;
   }
 
   NOTREACHED();
   return "";
 }
 
 bool File::Flush() {
   ElapsedTimer timer;
+  SCOPED_FILE_TRACE("Flush");
   bool return_value = DoFlush();
   UMA_HISTOGRAM_TIMES("PlatformFile.FlushTime", timer.Elapsed());
   return return_value;
 }
 
+File::TraceEnabler::TraceEnabler() {
+  FILE_TRACING_BEGIN();
+}
+
+File::TraceEnabler::~TraceEnabler() {
+  FILE_TRACING_END();
+}
+
 }  // namespace base