Revert "Move components/zip to third_party/zip", which broke linux and android tests.

This reverts r197964.

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@197972 0039d316-1c4b-4281-b951-d872f2087c98

14 files changed, 12 insertions, 15 deletions

diff --git a/chrome/DEPS b/chrome/DEPS
index 66a1c42..358576c 100644
--- a/chrome/DEPS
+++ b/chrome/DEPS
@@ -26,6 +26,7 @@ include_rules = [
   "+chrome/test",
   "+components/sessions",
   "+components/visitedlink/common",
+  "+components/zip",
   "+content/public/common",
   "+content/public/test",
   "+content/test/gpu",
@@ -49,7 +50,6 @@ include_rules = [
   "+third_party/npapi",       # NPAPI interface headers.
   "+third_party/skia",
   "+third_party/tcmalloc",
-  "+third_party/zlib/google",
   "+third_party/GTM",         # Google Toolbox for Mac.
 
   "+ui",
diff --git a/chrome/browser/chromeos/imageburner/burn_manager.cc b/chrome/browser/chromeos/imageburner/burn_manager.cc
index 133c06d..c875b8d 100644
--- a/chrome/browser/chromeos/imageburner/burn_manager.cc
+++ b/chrome/browser/chromeos/imageburner/burn_manager.cc
@@ -13,12 +13,12 @@
 #include "chromeos/dbus/image_burner_client.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
+#include "components/zip/zip.h"
 #include "content/public/browser/browser_thread.h"
 #include "grit/generated_resources.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_status.h"
-#include "third_party/zlib/google/zip.h"
 
 using content::BrowserThread;
 
diff --git a/chrome/browser/component_updater/component_unpacker.cc b/chrome/browser/component_updater/component_unpacker.cc
index 789448d..836b0c1 100644
--- a/chrome/browser/component_updater/component_unpacker.cc
+++ b/chrome/browser/component_updater/component_unpacker.cc
@@ -14,10 +14,10 @@
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/component_updater/component_updater_service.h"
 #include "chrome/common/extensions/extension_constants.h"
+#include "components/zip/zip.h"
 #include "crypto/secure_hash.h"
 #include "crypto/signature_verifier.h"
 #include "extensions/common/crx_file.h"
-#include "third_party/zlib/google/zip.h"
 
 using crypto::SecureHash;
 
diff --git a/chrome/browser/extensions/extension_creator.cc b/chrome/browser/extensions/extension_creator.cc
index 6efc50c..b7724c0 100644
--- a/chrome/browser/extensions/extension_creator.cc
+++ b/chrome/browser/extensions/extension_creator.cc
@@ -16,12 +16,12 @@
 #include "chrome/browser/extensions/extension_creator_filter.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_file_util.h"
+#include "components/zip/zip.h"
 #include "crypto/rsa_private_key.h"
 #include "crypto/signature_creator.h"
 #include "extensions/common/crx_file.h"
 #include "extensions/common/id_util.h"
 #include "grit/generated_resources.h"
-#include "third_party/zlib/google/zip.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
diff --git a/chrome/browser/feedback/feedback_data.cc b/chrome/browser/feedback/feedback_data.cc
index 5967b76..8c394d6 100644
--- a/chrome/browser/feedback/feedback_data.cc
+++ b/chrome/browser/feedback/feedback_data.cc
@@ -20,7 +20,7 @@
 #endif
 
 #if defined(OS_CHROMEOS)
-#include "third_party/zlib/google/zip.h"
+#include "components/zip/zip.h"
 #endif
 
 using content::BrowserThread;
diff --git a/chrome/browser/safe_browsing/download_protection_service_unittest.cc b/chrome/browser/safe_browsing/download_protection_service_unittest.cc
index 657e189..af98856 100644
--- a/chrome/browser/safe_browsing/download_protection_service_unittest.cc
+++ b/chrome/browser/safe_browsing/download_protection_service_unittest.cc
@@ -23,6 +23,7 @@
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/browser/safe_browsing/signature_util.h"
 #include "chrome/common/safe_browsing/csd.pb.h"
+#include "components/zip/zip.h"
 #include "content/public/test/mock_download_item.h"
 #include "content/public/test/test_browser_thread.h"
 #include "googleurl/src/gurl.h"
@@ -31,7 +32,6 @@
 #include "net/url_request/url_fetcher_delegate.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/zlib/google/zip.h"
 
 using ::testing::ContainerEq;
 using ::testing::DoAll;
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 2e838333..477aabb 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -50,7 +50,6 @@
         '../third_party/libjingle/libjingle.gyp:libjingle',
         '../third_party/libxml/libxml.gyp:libxml',
         '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',
-        '../third_party/zlib/zlib.gyp:zip',
         '../third_party/zlib/zlib.gyp:minizip',
         '../third_party/zlib/zlib.gyp:zlib',
         '../ui/base/strings/ui_strings.gyp:ui_strings',
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index c0d65c5..4e0f569 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -38,6 +38,7 @@
         '<(DEPTH)/chrome/chrome_resources.gyp:theme_resources',
         '<(DEPTH)/chrome/common_constants.gyp:common_constants',
         '<(DEPTH)/components/components.gyp:visitedlink_common',
+        '<(DEPTH)/components/components.gyp:zip',
         '<(DEPTH)/content/content.gyp:content_common',
         '<(DEPTH)/net/net.gyp:net',
         '<(DEPTH)/skia/skia.gyp:skia',
@@ -47,7 +48,6 @@
         '<(DEPTH)/third_party/libxml/libxml.gyp:libxml',
         '<(DEPTH)/third_party/mt19937ar/mt19937ar.gyp:mt19937ar',
         '<(DEPTH)/third_party/sqlite/sqlite.gyp:sqlite',
-        '<(DEPTH)/third_party/zlib/zlib.gyp:zip',
         '<(DEPTH)/ui/ui.gyp:ui_resources',
         '<(DEPTH)/webkit/support/webkit_support.gyp:user_agent',
       ],
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index 4de7f69..01926bf 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -1776,8 +1776,6 @@
         '../skia/ext/vector_canvas_unittest.cc',
         '../testing/gtest_mac_unittest.mm',
         '../third_party/cld/encodings/compact_lang_det/compact_lang_det_unittest_small.cc',
-        '../third_party/zlib/google/zip_reader_unittest.cc',
-        '../third_party/zlib/google/zip_unittest.cc',
         '../tools/json_schema_compiler/test/additional_properties_unittest.cc',
         '../tools/json_schema_compiler/test/any_unittest.cc',
         '../tools/json_schema_compiler/test/arrays_unittest.cc',
diff --git a/chrome/common/extensions/unpacker.cc b/chrome/common/extensions/unpacker.cc
index 0cf8d94..085bc86 100644
--- a/chrome/common/extensions/unpacker.cc
+++ b/chrome/common/extensions/unpacker.cc
@@ -22,13 +22,13 @@
 #include "chrome/common/extensions/extension_manifest_constants.h"
 #include "chrome/common/extensions/manifest.h"
 #include "chrome/common/url_constants.h"
+#include "components/zip/zip.h"
 #include "content/public/common/common_param_traits.h"
 #include "extensions/common/constants.h"
 #include "grit/generated_resources.h"
 #include "ipc/ipc_message_utils.h"
 #include "net/base/file_stream.h"
 #include "third_party/skia/include/core/SkBitmap.h"
-#include "third_party/zlib/google/zip.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "webkit/glue/image_decoder.h"
 
diff --git a/chrome/common/safe_browsing/zip_analyzer.cc b/chrome/common/safe_browsing/zip_analyzer.cc
index 394520a..b49ab22 100644
--- a/chrome/common/safe_browsing/zip_analyzer.cc
+++ b/chrome/common/safe_browsing/zip_analyzer.cc
@@ -6,7 +6,7 @@
 
 #include "base/logging.h"
 #include "chrome/common/safe_browsing/download_protection_util.h"
-#include "third_party/zlib/google/zip_reader.h"
+#include "components/zip/zip_reader.h"
 
 namespace safe_browsing {
 namespace zip_analyzer {
diff --git a/chrome/test/webdriver/webdriver_capabilities_parser_unittest.cc b/chrome/test/webdriver/webdriver_capabilities_parser_unittest.cc
index c9c0f2e..c7131a5 100644
--- a/chrome/test/webdriver/webdriver_capabilities_parser_unittest.cc
+++ b/chrome/test/webdriver/webdriver_capabilities_parser_unittest.cc
@@ -10,8 +10,8 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/webdriver/webdriver_capabilities_parser.h"
 #include "chrome/test/webdriver/webdriver_logging.h"
+#include "components/zip/zip.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/zlib/google/zip.h"
 
 using base::DictionaryValue;
 using base::ListValue;
diff --git a/chrome/test/webdriver/webdriver_util.cc b/chrome/test/webdriver/webdriver_util.cc
index 274144c..eba3916 100644
--- a/chrome/test/webdriver/webdriver_util.cc
+++ b/chrome/test/webdriver/webdriver_util.cc
@@ -20,7 +20,7 @@
 #include "base/third_party/icu/icu_utf.h"
 #include "chrome/common/automation_id.h"
 #include "chrome/test/automation/automation_json_requests.h"
-#include "third_party/zlib/google/zip.h"
+#include "components/zip/zip.h"
 
 using base::DictionaryValue;
 using base::ListValue;
diff --git a/chrome/utility/chrome_content_utility_client.cc b/chrome/utility/chrome_content_utility_client.cc
index 46a6c0e..18e2dec 100644
--- a/chrome/utility/chrome_content_utility_client.cc
+++ b/chrome/utility/chrome_content_utility_client.cc
@@ -34,11 +34,11 @@
 #include "chrome/common/safe_browsing/zip_analyzer.h"
 #include "chrome/common/web_resource/web_resource_unpacker.h"
 #include "chrome/utility/profile_import_handler.h"
+#include "components/zip/zip.h"
 #include "content/public/utility/utility_thread.h"
 #include "printing/backend/print_backend.h"
 #include "printing/page_range.h"
 #include "third_party/skia/include/core/SkBitmap.h"
-#include "third_party/zlib/google/zip.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/gfx/codec/jpeg_codec.h"
 #include "ui/gfx/rect.h"