chrome/browser/sync/test/integration/themes_helper.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/sync/test/integration/themes_helper.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/sync/test/integration/themes_helper.cc

diff --git a/chrome/browser/sync/test/integration/themes_helper.cc b/chrome/browser/sync/test/integration/themes_helper.cc

index 7f6c980b1be9021ddcc893c2988a5653eece8bd0..79a948cd4c268d099e640c6924deaa932c2bdf56 100644

--- a/chrome/browser/sync/test/integration/themes_helper.cc

+++ b/chrome/browser/sync/test/integration/themes_helper.cc

@@ -14,11 +14,10 @@

#include "chrome/browser/sync/test/integration/sync_extension_helper.h"

#include "chrome/browser/themes/theme_service.h"

#include "chrome/browser/themes/theme_service_factory.h"

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

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

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

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

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

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

#include "extensions/common/manifest.h"

using sync_datatype_helper::test;

@@ -39,7 +38,7 @@ ThemeService* GetThemeService(Profile* profile) {

namespace themes_helper {

std::string GetCustomTheme(int index) {

- return extensions::id_util::GenerateId(MakeName(index));

+ return crx_file::id_util::GenerateId(MakeName(index));

}

std::string GetThemeID(Profile* profile) {