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

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

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_API_IMAGE_WRITER_PRIVATE_OPERATION_H_
 #define CHROME_BROWSER_EXTENSIONS_API_IMAGE_WRITER_PRIVATE_OPERATION_H_
 
 #include "base/callback.h"
 #include "base/files/file.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/md5.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/memory/weak_ptr.h"
 #include "base/task/cancelable_task_tracker.h"
 #include "chrome/browser/extensions/api/image_writer_private/image_writer_utility_client.h"
 #include "chrome/common/extensions/api/image_writer_private.h"
-#include "third_party/zlib/google/zip_reader.h"
+
 
 namespace image_writer_api = extensions::api::image_writer_private;
 
 namespace base {
 class FilePath;
 }  // namespace base
 
+namespace zip {
+class ZipReader;
+}
+
 namespace extensions {
 namespace image_writer {
 
 const int kProgressComplete = 100;
 
 class OperationManager;
 
 // Encapsulates an operation being run on behalf of the
 // OperationManager.  Construction of the operation does not start
 // anything.  The operation's Start method should be called to start it, and
@@ skipping 165 matching lines @@
 
   // |stage_| and |progress_| are owned by the FILE thread, use |SetStage| and
   // |SetProgress| to update.  Progress should be in the interval [0,100]
   image_writer_api::Stage stage_;
   int progress_;
 
   // MD5 contexts don't play well with smart pointers.  Just going to allocate
   // memory here.  This requires that we only do one MD5 sum at a time.
   base::MD5Context md5_context_;
 
-  // Zip reader for unzip operations.
-  zip::ZipReader zip_reader_;
+  // Zip reader for unzip operations. The reason for using a pointer is that we
+  // don't want to include zip_reader.h here which can mangle definitions in
+  // jni.h when included in the same file. See crbug.com/554199.
+  scoped_ptr<zip::ZipReader> zip_reader_;
 
   // CleanUp operations that must be run.  All these functions are run on the
   // FILE thread.
   std::vector<base::Closure> cleanup_functions_;
 };
 
 }  // namespace image_writer
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_IMAGE_WRITER_PRIVATE_OPERATION_H_