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

Unified Diff: chrome/browser/sync/test/integration/sync_app_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/sync_app_helper.cc
diff --git a/chrome/browser/sync/test/integration/sync_app_helper.cc b/chrome/browser/sync/test/integration/sync_app_helper.cc
index 678ef8a33f85e325d1c319db0d1dfd54cdfd73ab..6123645c1972b6b990875865dbfced6788cd24d9 100644
--- a/chrome/browser/sync/test/integration/sync_app_helper.cc
+++ b/chrome/browser/sync/test/integration/sync_app_helper.cc
@@ -11,6 +11,7 @@
#include "chrome/browser/sync/test/integration/extensions_helper.h"
#include "chrome/browser/sync/test/integration/sync_datatype_helper.h"
#include "chrome/browser/sync/test/integration/sync_extension_helper.h"
+#include "extensions/common/id_util.h"
namespace {
@@ -145,7 +146,8 @@ syncer::StringOrdinal SyncAppHelper::GetPageOrdinalForApp(
Profile* profile,
const std::string& name) {
return profile->GetExtensionService()->extension_prefs()->
- extension_sorting()->GetPageOrdinal(SyncExtensionHelper::NameToId(name));
+ extension_sorting()->GetPageOrdinal(
+ extensions::id_util::GenerateId(name));
}
void SyncAppHelper::SetPageOrdinalForApp(
@@ -153,7 +155,7 @@ void SyncAppHelper::SetPageOrdinalForApp(
const std::string& name,
const syncer::StringOrdinal& page_ordinal) {
profile->GetExtensionService()->extension_prefs()->extension_sorting()->
- SetPageOrdinal(SyncExtensionHelper::NameToId(name), page_ordinal);
+ SetPageOrdinal(extensions::id_util::GenerateId(name), page_ordinal);
}
syncer::StringOrdinal SyncAppHelper::GetAppLaunchOrdinalForApp(
@@ -161,7 +163,7 @@ syncer::StringOrdinal SyncAppHelper::GetAppLaunchOrdinalForApp(
const std::string& name) {
return profile->GetExtensionService()->extension_prefs()->
extension_sorting()->GetAppLaunchOrdinal(
- SyncExtensionHelper::NameToId(name));
+ extensions::id_util::GenerateId(name));
}
void SyncAppHelper::SetAppLaunchOrdinalForApp(
@@ -169,7 +171,7 @@ void SyncAppHelper::SetAppLaunchOrdinalForApp(
const std::string& name,
const syncer::StringOrdinal& app_launch_ordinal) {
profile->GetExtensionService()->extension_prefs()->extension_sorting()->
- SetAppLaunchOrdinal(SyncExtensionHelper::NameToId(name),
+ SetAppLaunchOrdinal(extensions::id_util::GenerateId(name),
app_launch_ordinal);
}
« no previous file with comments | « chrome/browser/managed_mode/managed_user_service.cc ('k') | chrome/browser/sync/test/integration/sync_extension_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698