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

Unified Diff: chrome/common/pepper_permission_util_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:
View side-by-side diff with in-line comments
Download patch
Index: chrome/common/pepper_permission_util_unittest.cc
diff --git a/chrome/common/pepper_permission_util_unittest.cc b/chrome/common/pepper_permission_util_unittest.cc
index 32b3b05159e1524cbffee5391bc29e14885b3faa..b31297db161fbae7e29d1dd10f12b1b20f6a701a 100644
--- a/chrome/common/pepper_permission_util_unittest.cc
+++ b/chrome/common/pepper_permission_util_unittest.cc
@@ -8,9 +8,9 @@
#include <string>
#include "chrome/common/extensions/features/feature_channel.h"
+#include "components/crx_file/id_util.h"
#include "extensions/common/extension_builder.h"
#include "extensions/common/extension_set.h"
-#include "extensions/common/id_util.h"
#include "testing/gtest/include/gtest/gtest.h"
using chrome::IsExtensionOrSharedModuleWhitelisted;
@@ -45,7 +45,8 @@ scoped_refptr<Extension> CreateExtensionImportingModule(
TEST(PepperPermissionUtilTest, ExtensionWhitelisting) {
ScopedCurrentChannel current_channel(chrome::VersionInfo::CHANNEL_UNKNOWN);
ExtensionSet extensions;
- std::string whitelisted_id = id_util::GenerateId("whitelisted_extension");
+ std::string whitelisted_id =
+ crx_file::id_util::GenerateId("whitelisted_extension");
scoped_ptr<base::DictionaryValue> manifest =
DictionaryBuilder()
.Set("name", "Whitelisted Extension")
@@ -62,8 +63,8 @@ TEST(PepperPermissionUtilTest, ExtensionWhitelisting) {
std::string("/manifest.nmf");
std::string bad_scheme_url =
std::string("http://") + whitelisted_id + std::string("/manifest.nmf");
- std::string bad_host_url =
- std::string("chrome-extension://") + id_util::GenerateId("bad_host");
+ std::string bad_host_url = std::string("chrome-extension://") +
+ crx_file::id_util::GenerateId("bad_host");
std::string("/manifest.nmf");
EXPECT_FALSE(
@@ -80,8 +81,8 @@ TEST(PepperPermissionUtilTest, ExtensionWhitelisting) {
TEST(PepperPermissionUtilTest, SharedModuleWhitelisting) {
ScopedCurrentChannel current_channel(chrome::VersionInfo::CHANNEL_UNKNOWN);
ExtensionSet extensions;
- std::string whitelisted_id = id_util::GenerateId("extension_id");
- std::string bad_id = id_util::GenerateId("bad_id");
+ std::string whitelisted_id = crx_file::id_util::GenerateId("extension_id");
+ std::string bad_id = crx_file::id_util::GenerateId("bad_id");
scoped_ptr<base::DictionaryValue> shared_module_manifest =
DictionaryBuilder()
« no previous file with comments | « chrome/common/extensions/manifest_tests/extension_manifests_initvalue_unittest.cc ('k') | chrome/renderer/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698