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

Unified Diff: chrome/browser/sync/test/integration/sync_extension_helper.cc

Issue 12578008: Move CrxFile, FileReader, ExtensionResource to src/extensions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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_extension_helper.cc
diff --git a/chrome/browser/sync/test/integration/sync_extension_helper.cc b/chrome/browser/sync/test/integration/sync_extension_helper.cc
index 0175a9c25c63703b43c3b5eded5c375948b05f6d..f544330fe58a5f339aaa283308737eb7972ac7b9 100644
--- a/chrome/browser/sync/test/integration/sync_extension_helper.cc
+++ b/chrome/browser/sync/test/integration/sync_extension_helper.cc
@@ -17,6 +17,7 @@
#include "chrome/browser/sync/test/integration/sync_test.h"
#include "chrome/common/extensions/extension.h"
#include "chrome/common/extensions/extension_manifest_constants.h"
+#include "extensions/common/id_util.h"
#include "sync/api/string_ordinal.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -47,9 +48,7 @@ SyncExtensionHelper::~SyncExtensionHelper() {}
// static
std::string SyncExtensionHelper::NameToId(const std::string& name) {
Jeffrey Yasskin 2013/03/22 20:26:50 Inline this now?
Yoyo Zhou 2013/03/22 21:33:32 Done.
- std::string id;
- EXPECT_TRUE(Extension::GenerateId(name, &id));
- return id;
+ return extensions::id_util::GenerateId(name);
}
void SyncExtensionHelper::SetupIfNecessary(SyncTest* test) {

Powered by Google App Engine
This is Rietveld 408576698