chrome/common/extensions/extension_unittest.cc - Issue 506883003: Remove implicit conversions from scoped_refptr to T* in chrome/*/extensions/

Unified Diff: chrome/common/extensions/extension_unittest.cc

Issue 506883003: Remove implicit conversions from scoped_refptr to T* in chrome/*/extensions/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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

« no previous file with comments | « chrome/browser/extensions/webstore_standalone_installer.cc ('k') | chrome/common/extensions/manifest_handlers/content_scripts_manifest_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/common/extensions/extension_unittest.cc

diff --git a/chrome/common/extensions/extension_unittest.cc b/chrome/common/extensions/extension_unittest.cc

index f0d401b1fe0184c8db7e488a7113a73e4932ac8c..2d1973372f45bc324b315925fab17b3c1e050e49 100644

--- a/chrome/common/extensions/extension_unittest.cc

+++ b/chrome/common/extensions/extension_unittest.cc

@@ -242,69 +242,69 @@ TEST(ExtensionTest, WantsFileAccess) {

extension = LoadManifest("permissions", "permissions_all_urls.json");

EXPECT_TRUE(extension->wants_file_access());

EXPECT_FALSE(extension->permissions_data()->CanAccessPage(

- extension, file_url, file_url, -1, -1, NULL));

+ extension.get(), file_url, file_url, -1, -1, NULL));

extension = LoadManifest(

"permissions", "permissions_all_urls.json", Extension::ALLOW_FILE_ACCESS);

EXPECT_TRUE(extension->wants_file_access());

EXPECT_TRUE(extension->permissions_data()->CanAccessPage(

- extension, file_url, file_url, -1, -1, NULL));

+ extension.get(), file_url, file_url, -1, -1, NULL));

// file:///* permission

extension = LoadManifest("permissions", "permissions_file_scheme.json");

EXPECT_TRUE(extension->wants_file_access());

EXPECT_FALSE(extension->permissions_data()->CanAccessPage(

- extension, file_url, file_url, -1, -1, NULL));

+ extension.get(), file_url, file_url, -1, -1, NULL));

extension = LoadManifest("permissions",

"permissions_file_scheme.json",

Extension::ALLOW_FILE_ACCESS);

EXPECT_TRUE(extension->wants_file_access());

EXPECT_TRUE(extension->permissions_data()->CanAccessPage(

- extension, file_url, file_url, -1, -1, NULL));

+ extension.get(), file_url, file_url, -1, -1, NULL));

// http://* permission

extension = LoadManifest("permissions", "permissions_http_scheme.json");

EXPECT_FALSE(extension->wants_file_access());

EXPECT_FALSE(extension->permissions_data()->CanAccessPage(

- extension, file_url, file_url, -1, -1, NULL));

+ extension.get(), file_url, file_url, -1, -1, NULL));

extension = LoadManifest("permissions",

"permissions_http_scheme.json",

Extension::ALLOW_FILE_ACCESS);

EXPECT_FALSE(extension->wants_file_access());

EXPECT_FALSE(extension->permissions_data()->CanAccessPage(

- extension, file_url, file_url, -1, -1, NULL));

+ extension.get(), file_url, file_url, -1, -1, NULL));

// <all_urls> content script match

extension = LoadManifest("permissions", "content_script_all_urls.json");

EXPECT_TRUE(extension->wants_file_access());

EXPECT_FALSE(extension->permissions_data()->CanRunContentScriptOnPage(

- extension, file_url, file_url, -1, -1, NULL));

+ extension.get(), file_url, file_url, -1, -1, NULL));

extension = LoadManifest("permissions", "content_script_all_urls.json",

Extension::ALLOW_FILE_ACCESS);

EXPECT_TRUE(extension->wants_file_access());

EXPECT_TRUE(extension->permissions_data()->CanRunContentScriptOnPage(

- extension, file_url, file_url, -1, -1, NULL));

+ extension.get(), file_url, file_url, -1, -1, NULL));

// file:///* content script match

extension = LoadManifest("permissions", "content_script_file_scheme.json");

EXPECT_TRUE(extension->wants_file_access());

EXPECT_FALSE(extension->permissions_data()->CanRunContentScriptOnPage(

- extension, file_url, file_url, -1, -1, NULL));

+ extension.get(), file_url, file_url, -1, -1, NULL));

extension = LoadManifest("permissions", "content_script_file_scheme.json",

Extension::ALLOW_FILE_ACCESS);

EXPECT_TRUE(extension->wants_file_access());

EXPECT_TRUE(extension->permissions_data()->CanRunContentScriptOnPage(

- extension, file_url, file_url, -1, -1, NULL));

+ extension.get(), file_url, file_url, -1, -1, NULL));

// http://* content script match

extension = LoadManifest("permissions", "content_script_http_scheme.json");

EXPECT_FALSE(extension->wants_file_access());

EXPECT_FALSE(extension->permissions_data()->CanRunContentScriptOnPage(

- extension, file_url, file_url, -1, -1, NULL));

+ extension.get(), file_url, file_url, -1, -1, NULL));

extension = LoadManifest("permissions", "content_script_http_scheme.json",

Extension::ALLOW_FILE_ACCESS);

EXPECT_FALSE(extension->wants_file_access());

EXPECT_FALSE(extension->permissions_data()->CanRunContentScriptOnPage(

- extension, file_url, file_url, -1, -1, NULL));

+ extension.get(), file_url, file_url, -1, -1, NULL));

}

TEST(ExtensionTest, ExtraFlags) {