Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2036)

Unified Diff: chrome/browser/sync/test/integration/themes_helper.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:
View side-by-side diff with in-line comments
Download patch
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 67b41ff2986a4bcbda1e9e816444e12336c57799..dbfc0b17504eb25881dd2c300b82a2ab281707d2 100644
--- a/chrome/browser/sync/test/integration/themes_helper.cc
+++ b/chrome/browser/sync/test/integration/themes_helper.cc
@@ -7,13 +7,12 @@
#include "base/logging.h"
#include "base/strings/string_number_conversions.h"
#include "chrome/browser/sync/test/integration/sync_datatype_helper.h"
-#include "chrome/browser/sync/test/integration/sync_datatype_helper.h"
-#include "chrome/browser/sync/test/integration/sync_extension_helper.h"
#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 "chrome/common/extensions/extension.h"
#include "chrome/common/extensions/manifest.h"
+#include "extensions/common/id_util.h"
using sync_datatype_helper::test;
@@ -33,7 +32,7 @@ ThemeService* GetThemeService(Profile* profile) {
namespace themes_helper {
std::string GetCustomTheme(int index) {
- return SyncExtensionHelper::GetInstance()->NameToId(MakeName(index));
+ return extensions::id_util::GenerateId(MakeName(index));
}
std::string GetThemeID(Profile* profile) {

Powered by Google App Engine
This is Rietveld 408576698