chrome/browser/extensions/active_script_controller_unittest.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/active_script_controller_unittest.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/active_script_controller_unittest.cc

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

index 4ee5a54666ddfef7c8f62e2d8f26f074a8bf67f9..f816f6d513c01f41cd2a02ca942e1555ec41e89c 100644

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

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

@@ -12,6 +12,7 @@

#include "chrome/browser/extensions/tab_helper.h"

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

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

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

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

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

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

@@ -19,7 +20,6 @@

#include "extensions/common/extension.h"

#include "extensions/common/extension_builder.h"

#include "extensions/common/feature_switch.h"

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

#include "extensions/common/manifest.h"

#include "extensions/common/user_script.h"

#include "extensions/common/value_builder.h"

@@ -95,7 +95,7 @@ ActiveScriptControllerUnitTest::~ActiveScriptControllerUnitTest() {

}

const Extension* ActiveScriptControllerUnitTest::AddExtension() {

- const std::string kId = id_util::GenerateId("all_hosts_extension");

+ const std::string kId = crx_file::id_util::GenerateId("all_hosts_extension");

extension_ = ExtensionBuilder()

.SetManifest(

DictionaryBuilder()