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/browser | |
| 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/browser')
5 files changed, 5 insertions, 5 deletions
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; |