Refactor CRX verification in preparation to support CRX₃ files.

chrome/browser/extensions/extension_creator.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/extensions/extension_creator.h"
 
 #include <stddef.h>
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_file.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/strings/string_util.h"
 #include "chrome/browser/extensions/extension_creator_filter.h"
 #include "chrome/grit/generated_resources.h"
-#include "components/crx_file/crx_file.h"
+#include "components/crx_file/crx2_file.h"
 #include "components/crx_file/id_util.h"
 #include "crypto/rsa_private_key.h"
 #include "crypto/signature_creator.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/file_util.h"
 #include "third_party/zlib/google/zip.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
   const int kRSAKeySize = 2048;
@@ skipping 214 matching lines @@
     base::DeleteFile(crx_path, false);
   base::ScopedFILE crx_handle(base::OpenFile(crx_path, "wb"));
   if (!crx_handle.get()) {
     error_message_ = l10n_util::GetStringUTF8(IDS_EXTENSION_SHARING_VIOLATION);
     return false;
   }
 
   std::vector<uint8_t> public_key;
   CHECK(private_key->ExportPublicKey(&public_key));
 
-  crx_file::CrxFile::Error error;
-  std::unique_ptr<crx_file::CrxFile> crx(
-      crx_file::CrxFile::Create(public_key.size(), signature.size(), &error));
+  crx_file::Crx2File::Error error = crx_file::Crx2File::kMaxValue;
+  auto crx =

[Devlin, 2017/05/16 22:55:02]

nit: IMO, this reduces readability, since it's not clear what type Create()
returns.  auto should be used with, e.g., base::MakeUnique<> which is understood
to return a unique_ptr (and will be replaced by std::make_unique<>), but for
things like this, prefer having the full type.

[waffles, 2017/05/17 17:18:22]

Done.

+      crx_file::Crx2File::Create(public_key.size(), signature.size(), &error);
   if (!crx) {
-    LOG(ERROR) << "cannot create CrxFileHeader: " << error;
+    LOG(ERROR) << "cannot create Crx2FileHeader: " << error;
+    return false;

[Devlin, 2017/05/16 22:55:02]

this is a behavior change - maybe worth mentioning in the cl description?

[waffles, 2017/05/17 17:18:22]

Done.

   }
-  const crx_file::CrxFile::Header header = crx->header();
+  const crx_file::Crx2File::Header header = crx->header();
 
   if (fwrite(&header, sizeof(header), 1, crx_handle.get()) != 1) {
     PLOG(ERROR) << "fwrite failed to write header";
+    return false;
   }
   if (fwrite(&public_key.front(), sizeof(uint8_t), public_key.size(),
              crx_handle.get()) != public_key.size()) {
     PLOG(ERROR) << "fwrite failed to write public_key.front";
+    return false;
   }
   if (fwrite(&signature.front(), sizeof(uint8_t), signature.size(),
              crx_handle.get()) != signature.size()) {
     PLOG(ERROR) << "fwrite failed to write signature.front";
+    return false;
   }
 
   size_t buffer_size = 1 << 16;
   std::unique_ptr<uint8_t[]> buffer(new uint8_t[buffer_size]);
   size_t bytes_read = 0;
   base::ScopedFILE zip_handle(base::OpenFile(zip_path, "rb"));
   while ((bytes_read = fread(buffer.get(), 1, buffer_size,
                              zip_handle.get())) > 0) {
     if (fwrite(buffer.get(), sizeof(char), bytes_read, crx_handle.get()) !=
         bytes_read) {
       PLOG(ERROR) << "fwrite failed to write buffer";
+      return false;
     }
   }
 
   return true;
 }
 
 bool ExtensionCreator::Run(const base::FilePath& extension_dir,
                            const base::FilePath& crx_path,
                            const base::FilePath& private_key_path,
                            const base::FilePath& output_private_key_path,
@@ skipping 31 matching lines @@
       SignZip(zip_path, key_pair.get(), &signature) &&
       WriteCRX(zip_path, key_pair.get(), signature, crx_path)) {
     result = true;
   }
 
   base::DeleteFile(zip_path, false);
   return result;
 }
 
 }  // namespace extensions