Make ifdefs consistent in zib.

third_party/zlib/google/zip_reader.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 "third_party/zlib/google/zip_reader.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/files/file.h"
@@ skipping 496 matching lines @@
 }
 
 // FileWriterDelegate ----------------------------------------------------------
 
 FileWriterDelegate::FileWriterDelegate(base::File* file)
     : file_(file),
       file_length_(0) {
 }
 
 FileWriterDelegate::~FileWriterDelegate() {
-#if !defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)
+#if DCHECK_IS_ON()
   const bool success =

[satorux1, 2016/11/21 01:23:06]

Having a variable guarded by #ifdef looks a bit hard to read (not your fault).
How about:

  if (!file_->SetLength(file_length_)) {
    DPLOG(ERROR) << "Failed updating length of written file";
  }

[Alexander Alekseev, 2016/11/21 10:22:27]

Done.

 #endif
       file_->SetLength(file_length_);
   DPLOG_IF(ERROR, !success) << "Failed updating length of written file";
 }
 
 bool FileWriterDelegate::PrepareOutput() {
   return file_->Seek(base::File::FROM_BEGIN, 0) >= 0;
 }
 
 bool FileWriterDelegate::WriteBytes(const char* data, int num_bytes) {
   int bytes_written = file_->WriteAtCurrentPos(data, num_bytes);
   if (bytes_written > 0)
     file_length_ += bytes_written;
   return bytes_written == num_bytes;
 }
 
 }  // namespace zip