Commit 40eae71d authored by dcheng's avatar dcheng Committed by Commit bot

Remove implicit conversions from scoped_refptr to T* in chrome/*/extensions/

This patch was generated by running the rewrite_scoped_refptr clang tool
on a Linux build.

BUG=110610

Review URL: https://codereview.chromium.org/506883003

Cr-Commit-Position: refs/heads/master@{#292169}
parent 70362178
......@@ -351,7 +351,7 @@ void WebstoreStandaloneInstaller::InstallUIProceed() {
// downloading from the Web Store is not necessary.
scoped_refptr<const Extension> extension_to_install =
GetLocalizedExtensionForDisplay();
if (!extension_to_install) {
if (!extension_to_install.get()) {
CompleteInstall(webstore_install::INVALID_MANIFEST,
kInvalidManifestError);
return;
......@@ -424,14 +424,14 @@ void WebstoreStandaloneInstaller::OnExtensionInstallFailure(
void WebstoreStandaloneInstaller::ShowInstallUI() {
scoped_refptr<const Extension> localized_extension =
GetLocalizedExtensionForDisplay();
if (!localized_extension) {
if (!localized_extension.get()) {
CompleteInstall(webstore_install::INVALID_MANIFEST, kInvalidManifestError);
return;
}
install_ui_ = CreateInstallUI();
install_ui_->ConfirmStandaloneInstall(
this, localized_extension, &icon_, install_prompt_);
this, localized_extension.get(), &icon_, install_prompt_);
}
void WebstoreStandaloneInstaller::OnWebStoreDataFetcherDone() {
......
......@@ -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) {
......
......@@ -73,11 +73,11 @@ TEST_F(ContentScriptsManifestTest, ContentScriptIds) {
scoped_refptr<Extension> extension2 =
LoadAndExpectSuccess("content_script_yahoo.json");
const UserScriptList& user_scripts1 =
ContentScriptsInfo::GetContentScripts(extension1);
ContentScriptsInfo::GetContentScripts(extension1.get());
ASSERT_EQ(1u, user_scripts1.size());
int id = user_scripts1[0].id();
const UserScriptList& user_scripts2 =
ContentScriptsInfo::GetContentScripts(extension2);
ContentScriptsInfo::GetContentScripts(extension2.get());
ASSERT_EQ(1u, user_scripts2.size());
// The id of the content script should be one higher than the previous.
EXPECT_EQ(id + 1, user_scripts2[0].id());
......
......@@ -85,7 +85,7 @@ TEST_F(OverrideSettingsTest, ParseManifest) {
*static_cast<base::DictionaryValue*>(root.get()),
Extension::NO_FLAGS,
&error);
ASSERT_TRUE(extension);
ASSERT_TRUE(extension.get());
#if defined(OS_WIN)
ASSERT_TRUE(extension->manifest()->HasPath(manifest_keys::kSettingsOverride));
......@@ -128,7 +128,7 @@ TEST_F(OverrideSettingsTest, ParsePrepopulatedId) {
*static_cast<base::DictionaryValue*>(root.get()),
Extension::NO_FLAGS,
&error);
ASSERT_TRUE(extension);
ASSERT_TRUE(extension.get());
#if defined(OS_WIN)
ASSERT_TRUE(extension->manifest()->HasPath(manifest_keys::kSettingsOverride));
......@@ -169,7 +169,7 @@ TEST_F(OverrideSettingsTest, ParseBrokenManifest) {
extensions::manifest_keys::kSettingsOverride),
error);
#else
EXPECT_TRUE(extension);
EXPECT_TRUE(extension.get());
EXPECT_FALSE(
extension->manifest()->HasPath(manifest_keys::kSettingsOverride));
#endif
......
......@@ -62,7 +62,7 @@ TEST_F(UIOverrideTest, ParseManifest) {
*static_cast<base::DictionaryValue*>(root.get()),
Extension::NO_FLAGS,
&error);
ASSERT_TRUE(extension) << error;
ASSERT_TRUE(extension.get()) << error;
ASSERT_TRUE(extension->manifest()->HasPath(manifest_keys::kUIOverride));
UIOverrides* ui_override = static_cast<UIOverrides*>(
......@@ -91,7 +91,7 @@ TEST_F(UIOverrideTest, ParseBrokenManifest) {
*static_cast<base::DictionaryValue*>(root.get()),
Extension::NO_FLAGS,
&error);
EXPECT_FALSE(extension);
EXPECT_FALSE(extension.get());
EXPECT_EQ(
extensions::ErrorUtils::FormatErrorMessage(
extensions::manifest_errors::kInvalidEmptyDictionary,
......
......@@ -35,7 +35,7 @@ TEST_F(ExtensionManifestTest, ChromeURLPermissionAllowedWithFlag) {
EXPECT_EQ("", error);
const GURL newtab_url(chrome::kChromeUINewTabURL);
EXPECT_TRUE(extension->permissions_data()->CanAccessPage(
extension, newtab_url, newtab_url, 0, -1, &error))
extension.get(), newtab_url, newtab_url, 0, -1, &error))
<< error;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment