Index: base/files/file.cc |
diff --git a/base/files/file.cc b/base/files/file.cc |
index 774539f14ca0581e54c9e811489d4becfae09fec..8030bf13734e8a6b20bfe4f8f45ccc738885e075 100644 |
--- a/base/files/file.cc |
+++ b/base/files/file.cc |
@@ -4,7 +4,6 @@ |
#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" |
@@ -26,11 +25,11 @@ |
} |
#if !defined(OS_NACL) |
-File::File(const FilePath& path, uint32 flags) |
+File::File(const FilePath& name, uint32 flags) |
: error_details_(FILE_OK), |
created_(false), |
async_(false) { |
- Initialize(path, flags); |
+ Initialize(name, flags); |
} |
#endif |
@@ -52,7 +51,6 @@ |
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_) { |
@@ -67,7 +65,6 @@ |
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_; |
@@ -76,14 +73,12 @@ |
} |
#if !defined(OS_NACL) |
-void File::Initialize(const FilePath& path, uint32 flags) { |
- if (path.ReferencesParent()) { |
+void File::Initialize(const FilePath& name, uint32 flags) { |
+ if (name.ReferencesParent()) { |
error_details_ = FILE_ERROR_ACCESS_DENIED; |
return; |
} |
- path_ = path; |
- SCOPED_FILE_TRACE("Initialize"); |
- DoInitialize(flags); |
+ DoInitialize(name, flags); |
} |
#endif |
@@ -133,18 +128,9 @@ |
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 |