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;

[Sorin Jianu, 2017/05/15 19:49:51]

initialize?

[waffles, 2017/05/16 00:29:01]

Done.

+  std::unique_ptr<crx_file::Crx2File> crx(

[Sorin Jianu, 2017/05/15 19:49:51]

consider using the assignment syntax for initialization if possible.
https://sites.google.com/a/chromium.org/dev/developers/coding-style/cpp-dos-a...

[Sorin Jianu, 2017/05/15 19:49:51]

Could use auto.

[waffles, 2017/05/16 00:29:01]

Done.

[waffles, 2017/05/16 00:29:01]

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;

[Sorin Jianu, 2017/05/15 19:49:51]

If this error handling sufficient? It looks to me that the the execution flow
continues and the code may crash @261.

[waffles, 2017/05/16 00:29:01]

Hm, I agree. Seems strange. PTAL?

   }
-  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";
   }
   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";
   }
   if (fwrite(&signature.front(), sizeof(uint8_t), signature.size(),
              crx_handle.get()) != signature.size()) {
@@ skipping 53 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