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

Unified Diff: chrome/common/extensions/manifest_handlers/shared_module_manifest_unittest.cc

Issue 15836003: Update chrome/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 7 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/extensions/manifest_handlers/shared_module_manifest_unittest.cc
diff --git a/chrome/common/extensions/manifest_handlers/shared_module_manifest_unittest.cc b/chrome/common/extensions/manifest_handlers/shared_module_manifest_unittest.cc
index d5ddea8e1b070dabb4a612cc6411a4c82e64cb03..0fbdcfc3550259952bd3f231c092fd4c22784fcb 100644
--- a/chrome/common/extensions/manifest_handlers/shared_module_manifest_unittest.cc
+++ b/chrome/common/extensions/manifest_handlers/shared_module_manifest_unittest.cc
@@ -31,11 +31,13 @@ TEST_F(SharedModuleManifestTest, ExportsAll) {
scoped_refptr<Extension> extension = LoadAndExpectSuccess(manifest);
- EXPECT_TRUE(SharedModuleInfo::IsSharedModule(extension)) << manifest.name();
- EXPECT_FALSE(SharedModuleInfo::ImportsModules(extension)) << manifest.name();
- EXPECT_TRUE(SharedModuleInfo::IsExportAllowed(extension, "foo"))
+ EXPECT_TRUE(SharedModuleInfo::IsSharedModule(extension.get()))
<< manifest.name();
- EXPECT_TRUE(SharedModuleInfo::IsExportAllowed(extension, "foo/bar"))
+ EXPECT_FALSE(SharedModuleInfo::ImportsModules(extension.get()))
+ << manifest.name();
+ EXPECT_TRUE(SharedModuleInfo::IsExportAllowed(extension.get(), "foo"))
+ << manifest.name();
+ EXPECT_TRUE(SharedModuleInfo::IsExportAllowed(extension.get(), "foo/bar"))
<< manifest.name();
}
@@ -44,11 +46,13 @@ TEST_F(SharedModuleManifestTest, ExportFoo) {
scoped_refptr<Extension> extension = LoadAndExpectSuccess(manifest);
- EXPECT_TRUE(SharedModuleInfo::IsSharedModule(extension)) << manifest.name();
- EXPECT_FALSE(SharedModuleInfo::ImportsModules(extension)) << manifest.name();
- EXPECT_TRUE(SharedModuleInfo::IsExportAllowed(extension, "foo"))
+ EXPECT_TRUE(SharedModuleInfo::IsSharedModule(extension.get()))
+ << manifest.name();
+ EXPECT_FALSE(SharedModuleInfo::ImportsModules(extension.get()))
<< manifest.name();
- EXPECT_FALSE(SharedModuleInfo::IsExportAllowed(extension, "foo/bar"))
+ EXPECT_TRUE(SharedModuleInfo::IsExportAllowed(extension.get(), "foo"))
+ << manifest.name();
+ EXPECT_FALSE(SharedModuleInfo::IsExportAllowed(extension.get(), "foo/bar"))
<< manifest.name();
}
@@ -82,18 +86,23 @@ TEST_F(SharedModuleManifestTest, Import) {
scoped_refptr<Extension> extension = LoadAndExpectSuccess(manifest);
- EXPECT_FALSE(SharedModuleInfo::IsSharedModule(extension)) << manifest.name();
- EXPECT_TRUE(SharedModuleInfo::ImportsModules(extension)) << manifest.name();
+ EXPECT_FALSE(SharedModuleInfo::IsSharedModule(extension.get()))
+ << manifest.name();
+ EXPECT_TRUE(SharedModuleInfo::ImportsModules(extension.get()))
+ << manifest.name();
const std::vector<SharedModuleInfo::ImportInfo>& imports =
- SharedModuleInfo::GetImports(extension);
+ SharedModuleInfo::GetImports(extension.get());
ASSERT_EQ(2U, imports.size());
EXPECT_EQ(imports[0].extension_id, kImportId1);
EXPECT_EQ(imports[0].minimum_version, "");
EXPECT_EQ(imports[1].extension_id, kImportId2);
EXPECT_TRUE(base::Version(imports[1].minimum_version).IsValid());
- EXPECT_TRUE(SharedModuleInfo::ImportsExtensionById(extension, kImportId1));
- EXPECT_TRUE(SharedModuleInfo::ImportsExtensionById(extension, kImportId2));
- EXPECT_FALSE(SharedModuleInfo::ImportsExtensionById(extension, kNoImport));
+ EXPECT_TRUE(
+ SharedModuleInfo::ImportsExtensionById(extension.get(), kImportId1));
+ EXPECT_TRUE(
+ SharedModuleInfo::ImportsExtensionById(extension.get(), kImportId2));
+ EXPECT_FALSE(
+ SharedModuleInfo::ImportsExtensionById(extension.get(), kNoImport));
}
TEST_F(SharedModuleManifestTest, ImportParseErrors) {

Powered by Google App Engine
This is Rietveld 408576698