Index: chrome/browser/extensions/sandboxed_unpacker.cc |
diff --git a/chrome/browser/extensions/sandboxed_unpacker.cc b/chrome/browser/extensions/sandboxed_unpacker.cc |
index f54c41d9ee4f280bc774d9bf383353c72bc6e28e..bfdc115ad82ddfd5888ec4a4e70575cc25bbd13d 100644 |
--- a/chrome/browser/extensions/sandboxed_unpacker.cc |
+++ b/chrome/browser/extensions/sandboxed_unpacker.cc |
@@ -26,12 +26,13 @@ |
#include "chrome/common/chrome_utility_messages.h" |
#include "chrome/common/extensions/chrome_utility_extensions_messages.h" |
#include "chrome/common/extensions/extension_file_util.h" |
+#include "components/crx_file/constants.h" |
+#include "components/crx_file/crx_file.h" |
#include "content/public/browser/browser_thread.h" |
#include "content/public/browser/utility_process_host.h" |
#include "content/public/common/common_param_traits.h" |
#include "crypto/signature_verifier.h" |
#include "extensions/common/constants.h" |
-#include "extensions/common/crx_file.h" |
#include "extensions/common/extension.h" |
#include "extensions/common/extension_l10n_util.h" |
#include "extensions/common/file_util.h" |
@@ -46,6 +47,7 @@ |
using base::ASCIIToUTF16; |
using content::BrowserThread; |
using content::UtilityProcessHost; |
+using crx_file::CrxFile; |
// The following macro makes histograms that record the length of paths |
// in this file much easier to read. |
@@ -543,8 +545,8 @@ bool SandboxedUnpacker::ValidateSignature() { |
} |
crypto::SignatureVerifier verifier; |
- if (!verifier.VerifyInit(extension_misc::kSignatureAlgorithm, |
- sizeof(extension_misc::kSignatureAlgorithm), |
+ if (!verifier.VerifyInit(crx_file::kSignatureAlgorithm, |
+ sizeof(crx_file::kSignatureAlgorithm), |
&signature.front(), |
signature.size(), |
&key.front(), |