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

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

Index: chrome/browser/extensions/api/image_writer_private/operation.h
diff --git a/chrome/browser/extensions/api/image_writer_private/operation.h b/chrome/browser/extensions/api/image_writer_private/operation.h
index f4e025d5bde3d962064b072c7fbe46d6a9bb9d05..b2d6aaa1f6ed19401d40b9acea0178f6e679a140 100644
--- a/chrome/browser/extensions/api/image_writer_private/operation.h
+++ b/chrome/browser/extensions/api/image_writer_private/operation.h
@@ -14,7 +14,7 @@
 #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;
 
@@ -22,6 +22,10 @@ namespace base {
 class FilePath;
 }  // namespace base
 
+namespace zip {
+class ZipReader;
+}
+
 namespace extensions {
 namespace image_writer {
 
@@ -208,7 +212,7 @@ class Operation : public base::RefCountedThreadSafe<Operation> {
   base::MD5Context md5_context_;
 
   // Zip reader for unzip operations.
-  zip::ZipReader zip_reader_;

[Drew Haven, 2015/11/16 21:19:00]

Can you add a quick comment on why this is a pointer and not a field? Just so
that no one gets confused in the future as to why this needs to be a pointer and
doesn't try to clean up the code.

[Hadi, 2015/11/16 21:33:03]

Done.

+  scoped_ptr<zip::ZipReader> zip_reader_;
 
   // CleanUp operations that must be run.  All these functions are run on the
   // FILE thread.