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/feedback/feedback_data.cc | |
| 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/feedback/feedback_data.cc')
| -rw-r--r-- | chrome/browser/feedback/feedback_data.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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; |