chrome/browser/extensions/extension_function_test_utils.cc - Issue 12578008: Move CrxFile, FileReader, ExtensionResource to src/extensions.

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/extension_function_test_utils.cc

Issue 12578008: Move CrxFile, FileReader, ExtensionResource to src/extensions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 9 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/extension_function_test_utils.cc

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

index b642c1fd0145a3b88f59e85023c5e6b42f0973e0..d834aa002a693d5a709e8c981c66e59d53534f7a 100644

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

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

@@ -15,6 +15,7 @@

#include "chrome/browser/ui/browser.h"

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

#include "chrome/test/base/ui_test_utils.h"

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

#include "testing/gtest/include/gtest/gtest.h"

using content::WebContents;

@@ -135,7 +136,7 @@ scoped_refptr<Extension> CreateExtension(

const base::FilePath test_extension_path;

std::string id;

if (!id_input.empty())

- CHECK(Extension::GenerateId(id_input, &id));

+ id = extensions::id_util::GenerateId(id_input);

scoped_refptr<Extension> extension(Extension::Create(

test_extension_path,

location,