New Zip::ZipFromMemory API.

chrome/browser/safe_browsing/download_protection_service_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/safe_browsing/download_protection_service.h"
 
 #include <map>
 #include <string>
 
 #include "base/base_paths.h"
@@ skipping 17 matching lines @@
 #include "content/public/test/mock_download_item.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "content/public/test/test_utils.h"
 #include "net/cert/x509_certificate.h"
 #include "net/http/http_status_code.h"
 #include "net/url_request/test_url_fetcher_factory.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "net/url_request/url_request_status.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/zlib/google/zip.h"
+#include "third_party/zlib/google/zip_writer.h"
 #include "url/gurl.h"
 
 using ::testing::Assign;
 using ::testing::ContainerEq;
 using ::testing::DoAll;
 using ::testing::ElementsAre;
 using ::testing::Mock;
 using ::testing::NotNull;
 using ::testing::Return;
 using ::testing::ReturnRef;
@@ skipping 651 matching lines @@
   EXPECT_CALL(item, GetTargetFilePath()).WillRepeatedly(ReturnRef(a_zip));
   EXPECT_CALL(item, GetUrlChain()).WillRepeatedly(ReturnRef(url_chain));
   EXPECT_CALL(item, GetReferrerUrl()).WillRepeatedly(ReturnRef(referrer));
   EXPECT_CALL(item, GetHash()).WillRepeatedly(ReturnRef(hash));
   EXPECT_CALL(item, GetReceivedBytes()).WillRepeatedly(Return(100));
   EXPECT_CALL(item, HasUserGesture()).WillRepeatedly(Return(true));
   EXPECT_CALL(item, GetRemoteAddress()).WillRepeatedly(Return(""));
 
   // Write out a zip archive to the temporary file.  In this case, it
   // only contains a text file.
-  base::ScopedTempDir zip_source_dir;
-  ASSERT_TRUE(zip_source_dir.CreateUniqueTempDir());
-  std::string file_contents = "dummy file";
-  ASSERT_EQ(static_cast<int>(file_contents.size()), file_util::WriteFile(
-      zip_source_dir.path().Append(FILE_PATH_LITERAL("file.txt")),
-      file_contents.data(), file_contents.size()));
-  ASSERT_TRUE(zip::Zip(zip_source_dir.path(), a_tmp, false));
+  zip::ZipWriter writer;
+  writer.AddFile(base::FilePath(FILE_PATH_LITERAL("file.txt")),
+                 base::StringPiece("dummy file", 10));

[satorux1, 2014/03/24 06:16:07]

please drop ", 10". this should be unnecessary.

+  ASSERT_TRUE(writer.Commit(a_tmp, zip::ZipWriter::OverWrite));
 
   download_service_->CheckClientDownload(
       &item,
       base::Bind(&DownloadProtectionServiceTest::CheckDoneCallback,
                  base::Unretained(this)));
   MessageLoop::current()->Run();
   EXPECT_TRUE(IsResult(DownloadProtectionService::SAFE));
   Mock::VerifyAndClearExpectations(sb_service_.get());
   Mock::VerifyAndClearExpectations(signature_util_.get());
 
   // Now check with an executable in the zip file as well.
-  ASSERT_EQ(static_cast<int>(file_contents.size()), file_util::WriteFile(
-      zip_source_dir.path().Append(FILE_PATH_LITERAL("file.exe")),
-      file_contents.data(), file_contents.size()));
-  ASSERT_TRUE(zip::Zip(zip_source_dir.path(), a_tmp, false));
+  writer.AddFile(base::FilePath(FILE_PATH_LITERAL("file.exe")),
+                 base::StringPiece("dummy file", 10));

[satorux1, 2014/03/24 06:16:07]

ditto

+  ASSERT_TRUE(writer.Commit(a_tmp, zip::ZipWriter::OverWrite));
 
   EXPECT_CALL(*sb_service_->mock_database_manager(),
               MatchDownloadWhitelistUrl(_))
       .WillRepeatedly(Return(false));
 
   download_service_->CheckClientDownload(
       &item,
       base::Bind(&DownloadProtectionServiceTest::CheckDoneCallback,
                  base::Unretained(this)));
   MessageLoop::current()->Run();
@@ skipping 474 matching lines @@
   EXPECT_THAT(whitelist_strings, ElementsAre(cert_base + "/OU=unit"));
 
   cert = ReadTestCertificate("test_c.pem");
   ASSERT_TRUE(cert.get());
   whitelist_strings.clear();
   GetCertificateWhitelistStrings(
       *cert.get(), *issuer_cert.get(), &whitelist_strings);
   EXPECT_THAT(whitelist_strings, ElementsAre());
 }
 }  // namespace safe_browsing