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

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

index 5a22d2a6478f03a7f09f758f485dac97757cddc4..ed64334423bea398e59f1c43379ed06b118bb472 100644

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

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

@@ -11,13 +11,13 @@

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

#include "chrome/browser/profiles/profile.h"

#include "chrome/common/extensions/api/extension_action/action_info.h"

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

#include "extensions/browser/extension_prefs.h"

#include "extensions/browser/extension_registry.h"

#include "extensions/browser/extension_system.h"

#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_constants.h"

#include "extensions/common/value_builder.h"

@@ -39,7 +39,7 @@ scoped_refptr<const Extension> GetActionExtension(const std::string& name,

manifest.Set(action_key, DictionaryBuilder().Pass());

return ExtensionBuilder().SetManifest(manifest.Pass())

- .SetID(id_util::GenerateId(name))

+ .SetID(crx_file::id_util::GenerateId(name))

.Build();

}