diff options
| author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-02 21:25:20 +0000 |
|---|---|---|
| committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-02 21:25:20 +0000 |
| commit | 2bfe16c46a649b378208484be901769a8e36625e (patch) | |
| tree | 070ac98cea8c46332abe3a07b6acbf79426ad461 /chrome/utility | |
| parent | 41208b9eb3885b1bd3a4e69542f541f1f7df8a23 (diff) | |
| download | chromium_src-2bfe16c46a649b378208484be901769a8e36625e.zip chromium_src-2bfe16c46a649b378208484be901769a8e36625e.tar.gz chromium_src-2bfe16c46a649b378208484be901769a8e36625e.tar.bz2 | |
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
Diffstat (limited to 'chrome/utility')
| -rw-r--r-- | chrome/utility/chrome_content_utility_client.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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" |