chrome/common/extensions/manifest_tests/extension_manifests_requirements_unittest.cc - Issue 15836003: Update chrome/ to use scoped_refptr<T>::get() rather than implicit "operator T*"

Unified Diff: chrome/common/extensions/manifest_tests/extension_manifests_requirements_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

« no previous file with comments | « chrome/common/extensions/manifest_tests/extension_manifests_platformapp_unittest.cc ('k') | chrome/common/extensions/manifest_tests/extension_manifests_sandboxed_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/common/extensions/manifest_tests/extension_manifests_requirements_unittest.cc

diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_requirements_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_requirements_unittest.cc

index b182059e053e57e29f0bb061e8dff9a7b4236fcf..02d6f2edd8b6da9286c4b75b7318ea0b9a4f0d00 100644

--- a/chrome/common/extensions/manifest_tests/extension_manifests_requirements_unittest.cc

+++ b/chrome/common/extensions/manifest_tests/extension_manifests_requirements_unittest.cc

@@ -51,16 +51,16 @@ TEST_F(RequirementsManifestTest, RequirementsValid) {

scoped_refptr<Extension> extension(LoadAndExpectSuccess(

"requirements_valid_empty.json"));

ASSERT_TRUE(extension.get());

- EXPECT_EQ(RequirementsInfo::GetRequirements(extension).webgl, false);

- EXPECT_EQ(RequirementsInfo::GetRequirements(extension).css3d, false);

- EXPECT_EQ(RequirementsInfo::GetRequirements(extension).npapi, false);

+ EXPECT_EQ(RequirementsInfo::GetRequirements(extension.get()).webgl, false);

+ EXPECT_EQ(RequirementsInfo::GetRequirements(extension.get()).css3d, false);

+ EXPECT_EQ(RequirementsInfo::GetRequirements(extension.get()).npapi, false);

// Test loading all the requirements.

extension = LoadAndExpectSuccess("requirements_valid_full.json");

ASSERT_TRUE(extension.get());

- EXPECT_EQ(RequirementsInfo::GetRequirements(extension).webgl, true);

- EXPECT_EQ(RequirementsInfo::GetRequirements(extension).css3d, true);

- EXPECT_EQ(RequirementsInfo::GetRequirements(extension).npapi, true);

+ EXPECT_EQ(RequirementsInfo::GetRequirements(extension.get()).webgl, true);

+ EXPECT_EQ(RequirementsInfo::GetRequirements(extension.get()).css3d, true);

+ EXPECT_EQ(RequirementsInfo::GetRequirements(extension.get()).npapi, true);

}

// When an npapi plugin is present, the default of the "npapi" requirement

@@ -69,28 +69,28 @@ TEST_F(RequirementsManifestTest, RequirementsNpapiDefault) {

scoped_refptr<Extension> extension(LoadAndExpectSuccess(

"requirements_npapi_empty.json"));

ASSERT_TRUE(extension.get());

- EXPECT_EQ(RequirementsInfo::GetRequirements(extension).webgl, false);

- EXPECT_EQ(RequirementsInfo::GetRequirements(extension).css3d, false);

- EXPECT_EQ(RequirementsInfo::GetRequirements(extension).npapi, true);

+ EXPECT_EQ(RequirementsInfo::GetRequirements(extension.get()).webgl, false);

+ EXPECT_EQ(RequirementsInfo::GetRequirements(extension.get()).css3d, false);

+ EXPECT_EQ(RequirementsInfo::GetRequirements(extension.get()).npapi, true);

extension = LoadAndExpectSuccess(

"requirements_npapi_empty_plugins_empty.json");

ASSERT_TRUE(extension.get());

- EXPECT_EQ(RequirementsInfo::GetRequirements(extension).webgl, false);

- EXPECT_EQ(RequirementsInfo::GetRequirements(extension).css3d, false);

- EXPECT_EQ(RequirementsInfo::GetRequirements(extension).npapi, false);

+ EXPECT_EQ(RequirementsInfo::GetRequirements(extension.get()).webgl, false);

+ EXPECT_EQ(RequirementsInfo::GetRequirements(extension.get()).css3d, false);

+ EXPECT_EQ(RequirementsInfo::GetRequirements(extension.get()).npapi, false);

extension = LoadAndExpectSuccess("requirements_npapi.json");

ASSERT_TRUE(extension.get());

- EXPECT_EQ(RequirementsInfo::GetRequirements(extension).webgl, false);

- EXPECT_EQ(RequirementsInfo::GetRequirements(extension).css3d, false);

- EXPECT_EQ(RequirementsInfo::GetRequirements(extension).npapi, false);

+ EXPECT_EQ(RequirementsInfo::GetRequirements(extension.get()).webgl, false);

+ EXPECT_EQ(RequirementsInfo::GetRequirements(extension.get()).css3d, false);

+ EXPECT_EQ(RequirementsInfo::GetRequirements(extension.get()).npapi, false);

extension = LoadAndExpectSuccess("requirements_npapi_plugins_empty.json");

ASSERT_TRUE(extension.get());

- EXPECT_EQ(RequirementsInfo::GetRequirements(extension).webgl, false);

- EXPECT_EQ(RequirementsInfo::GetRequirements(extension).css3d, false);

- EXPECT_EQ(RequirementsInfo::GetRequirements(extension).npapi, true);

+ EXPECT_EQ(RequirementsInfo::GetRequirements(extension.get()).webgl, false);

+ EXPECT_EQ(RequirementsInfo::GetRequirements(extension.get()).css3d, false);

+ EXPECT_EQ(RequirementsInfo::GetRequirements(extension.get()).npapi, true);

}

} // namespace extensions