New Zip::ZipFromMemory API.

chrome/browser/feedback/feedback_util.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/feedback/feedback_util.h"
 
 #include <sstream>
 #include <string>
 #include <vector>
 
@@ skipping 28 matching lines @@
 #include "content/public/common/content_client.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "net/base/load_flags.h"
 #include "net/http/http_request_headers.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "net/url_request/url_request_status.h"
 #include "third_party/icu/source/common/unicode/locid.h"
-#include "third_party/zlib/google/zip.h"
+#include "third_party/zlib/google/zip_writer.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "url/gurl.h"
 
 namespace {
 
 GURL GetTargetTabUrl(int session_id, int index) {
   Browser* browser = chrome::FindBrowserWithID(session_id);
   // Sanity checks.
   if (!browser || index >= browser->tab_strip_model()->count())
     return GURL();
@@ skipping 181 matching lines @@
   scoped_ptr<std::string> post_body(new std::string);
   feedback_data.SerializeToString(post_body.get());
 
   feedback::FeedbackUploader *uploader =
       feedback::FeedbackUploaderFactory::GetForBrowserContext(data->profile());
   uploader->QueueReport(post_body.Pass());
 }
 
 bool ZipString(const base::FilePath& filename,
                const std::string& data, std::string* compressed_logs) {
-  base::FilePath temp_path;
   base::FilePath zip_file;
 
-  // Create a temporary directory, put the logs into a file in it. Create
-  // another temporary file to receive the zip file in.
-  if (!base::CreateNewTempDirectory(base::FilePath::StringType(), &temp_path))
-    return false;
-  if (file_util::WriteFile(temp_path.Append(filename),
-                           data.c_str(), data.size()) == -1)
-    return false;
+  zip::ZipWriter writer;
+  writer.AddFile(filename, data);
 
   bool succeed = base::CreateTemporaryFile(&zip_file) &&
-      zip::Zip(temp_path, zip_file, false) &&
+      writer.Commit(zip_file, zip::ZipWriter::OverWrite) &&
       base::ReadFileToString(zip_file, compressed_logs);
 
-  base::DeleteFile(temp_path, true);
   base::DeleteFile(zip_file, false);
 
   return succeed;
 }
 
 }  // namespace feedback_util