chrome/browser/extensions/sandboxed_unpacker.cc - Issue 481433005: Extensions: Move id_util functions to crx_file component.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/extensions/sandboxed_unpacker.cc

Issue 481433005: Extensions: Move id_util functions to crx_file component. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: revert last patchset. function returns Extension* and can't use an assert. Created 6 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chrome/browser/extensions/sandboxed_unpacker.cc

diff --git a/chrome/browser/extensions/sandboxed_unpacker.cc b/chrome/browser/extensions/sandboxed_unpacker.cc

index bfdc115ad82ddfd5888ec4a4e70575cc25bbd13d..05fef3b06648976b3b1dec3c3a1ee49ec7a75bc6 100644

--- a/chrome/browser/extensions/sandboxed_unpacker.cc

+++ b/chrome/browser/extensions/sandboxed_unpacker.cc

@@ -28,6 +28,7 @@

#include "chrome/common/extensions/extension_file_util.h"

#include "components/crx_file/constants.h"

#include "components/crx_file/crx_file.h"

+#include "components/crx_file/id_util.h"

#include "content/public/browser/browser_thread.h"

#include "content/public/browser/utility_process_host.h"

#include "content/public/common/common_param_traits.h"

@@ -36,7 +37,6 @@

#include "extensions/common/extension.h"

#include "extensions/common/extension_l10n_util.h"

#include "extensions/common/file_util.h"

-#include "extensions/common/id_util.h"

#include "extensions/common/manifest_constants.h"

#include "extensions/common/manifest_handlers/icons_handler.h"

#include "grit/generated_resources.h"

@@ -579,7 +579,7 @@ bool SandboxedUnpacker::ValidateSignature() {

std::string(reinterpret_cast<char*>(&key.front()), key.size());

base::Base64Encode(public_key, &public_key_);

- extension_id_ = id_util::GenerateId(public_key);

+ extension_id_ = crx_file::id_util::GenerateId(public_key);

return true;

}