BASELINE: Update chromium to 40.0.2214.28 and ninja to 1.5.3.

Change-Id: I759465284fd64d59ad120219cbe257f7402c4181
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>

1 files changed, 4 insertions, 9 deletions

diff --git a/chromium/base/files/file.cc b/chromium/base/files/file.cc
index bfe87bdcc4d..ea8dbf27ac1 100644
--- a/chromium/base/files/file.cc
+++ b/chromium/base/files/file.cc
@@ -3,9 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/files/file.h"
-
-// TODO(rvargas): remove this (needed for kInvalidPlatformFileValue).
-#include "base/platform_file.h"
+#include "base/files/file_path.h"
 
 namespace base {
 
@@ -19,16 +17,14 @@ File::Info::~Info() {
 }
 
 File::File()
-    : file_(kInvalidPlatformFileValue),
-      error_details_(FILE_ERROR_FAILED),
+    : error_details_(FILE_ERROR_FAILED),
       created_(false),
       async_(false) {
 }
 
 #if !defined(OS_NACL)
 File::File(const FilePath& name, uint32 flags)
-    : file_(kInvalidPlatformFileValue),
-      error_details_(FILE_OK),
+    : error_details_(FILE_OK),
       created_(false),
       async_(false) {
   Initialize(name, flags);
@@ -46,8 +42,7 @@ File::File(PlatformFile platform_file)
 }
 
 File::File(Error error_details)
-    : file_(kInvalidPlatformFileValue),
-      error_details_(error_details),
+    : error_details_(error_details),
       created_(false),
       async_(false) {
 }