Aura on Android: fix mangling of definitions in jni.h by Byte definition in zlib.

chrome/browser/extensions/api/image_writer_private/operation.cc

 // Copyright 2013 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 "chrome/browser/extensions/api/image_writer_private/operation.h"
 
 #include "base/files/file_enumerator.h"
 #include "base/files/file_util.h"
 #include "base/lazy_instance.h"
 #include "base/threading/worker_pool.h"
 #include "chrome/browser/extensions/api/image_writer_private/error_messages.h"
 #include "chrome/browser/extensions/api/image_writer_private/operation_manager.h"
 #include "content/public/browser/browser_thread.h"
+#include "third_party/zlib/google/zip_reader.h"
 
 namespace extensions {
 namespace image_writer {
 
 using content::BrowserThread;
 
 const int kMD5BufferSize = 1024;
 #if defined(OS_CHROMEOS)
 // Chrome OS only has a 1 GB temporary partition.  This is too small to hold our
 // unzipped image. Fortunately we mount part of the temporary partition under
@@ skipping 10 matching lines @@
                      const ExtensionId& extension_id,
                      const std::string& device_path)
     : manager_(manager),
       extension_id_(extension_id),
 #if defined(OS_WIN)
       device_path_(base::FilePath::FromUTF8Unsafe(device_path)),
 #else
       device_path_(device_path),
 #endif
       stage_(image_writer_api::STAGE_UNKNOWN),
-      progress_(0) {
+      progress_(0),
+      zip_reader_(new zip::ZipReader) {
 }
 
 Operation::~Operation() {}
 
 void Operation::Cancel() {
   DCHECK_CURRENTLY_ON(BrowserThread::FILE);
 
   stage_ = image_writer_api::STAGE_NONE;
 
   CleanUp();
@@ skipping 43 matching lines @@
     return;
   }
 
   if (image_path_.Extension() != FILE_PATH_LITERAL(".zip")) {
     BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, continuation);
     return;
   }
 
   SetStage(image_writer_api::STAGE_UNZIP);
 
-  if (!(zip_reader_.Open(image_path_) && zip_reader_.AdvanceToNextEntry() &&
-        zip_reader_.OpenCurrentEntryInZip())) {
+  if (!(zip_reader_->Open(image_path_) && zip_reader_->AdvanceToNextEntry() &&
+        zip_reader_->OpenCurrentEntryInZip())) {
     Error(error::kUnzipGenericError);
     return;
   }
 
-  if (zip_reader_.HasMore()) {
+  if (zip_reader_->HasMore()) {
     Error(error::kUnzipInvalidArchive);
     return;
   }
 
   // Create a new target to unzip to.  The original file is opened by the
   // zip_reader_.
-  zip::ZipReader::EntryInfo* entry_info = zip_reader_.current_entry_info();
+  zip::ZipReader::EntryInfo* entry_info = zip_reader_->current_entry_info();
   if (entry_info) {
     image_path_ = temp_dir_.path().Append(entry_info->file_path().BaseName());
   } else {
     Error(error::kTempDirError);
     return;
   }
 
-  zip_reader_.ExtractCurrentEntryToFilePathAsync(
+  zip_reader_->ExtractCurrentEntryToFilePathAsync(
       image_path_,
       base::Bind(&Operation::CompleteAndContinue, this, continuation),
       base::Bind(&Operation::OnUnzipFailure, this),
       base::Bind(&Operation::OnUnzipProgress,
                  this,
-                 zip_reader_.current_entry_info()->original_size()));
+                 zip_reader_->current_entry_info()->original_size()));
 }
 
 void Operation::Finish() {
   if (!BrowserThread::CurrentlyOn(BrowserThread::FILE)) {
     BrowserThread::PostTask(
         BrowserThread::FILE, FROM_HERE, base::Bind(&Operation::Finish, this));
     return;
   }
 
   CleanUp();
@@ skipping 241 matching lines @@
   for (std::vector<base::Closure>::iterator it = cleanup_functions_.begin();
        it != cleanup_functions_.end();
        ++it) {
     it->Run();
   }
   cleanup_functions_.clear();
 }
 
 }  // namespace image_writer
 }  // namespace extensions