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

Unified Diff: chrome/common/extensions/manifest_tests/extension_manifests_background_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_tests/extension_manifests_background_unittest.cc
diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_background_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_background_unittest.cc
index 26e95137f0eb5f78d9fece94c6bbe8859cf446e7..7b49ccabd2480f7d91b0dba37de5cf7e7e27649e 100644
--- a/chrome/common/extensions/manifest_tests/extension_manifests_background_unittest.cc
+++ b/chrome/common/extensions/manifest_tests/extension_manifests_background_unittest.cc
@@ -37,17 +37,17 @@ TEST_F(ExtensionManifestBackgroundTest, BackgroundScripts) {
scoped_refptr<Extension> extension(
LoadAndExpectSuccess(Manifest(manifest.get(), "")));
- ASSERT_TRUE(extension);
+ ASSERT_TRUE(extension.get());
const std::vector<std::string>& background_scripts =
- BackgroundInfo::GetBackgroundScripts(extension);
+ BackgroundInfo::GetBackgroundScripts(extension.get());
ASSERT_EQ(2u, background_scripts.size());
EXPECT_EQ("foo.js", background_scripts[0u]);
EXPECT_EQ("bar/baz.js", background_scripts[1u]);
- EXPECT_TRUE(BackgroundInfo::HasBackgroundPage(extension));
- EXPECT_EQ(std::string("/") +
- extension_filenames::kGeneratedBackgroundPageFilename,
- BackgroundInfo::GetBackgroundURL(extension).path());
+ EXPECT_TRUE(BackgroundInfo::HasBackgroundPage(extension.get()));
+ EXPECT_EQ(
+ std::string("/") + extension_filenames::kGeneratedBackgroundPageFilename,
+ BackgroundInfo::GetBackgroundURL(extension.get()).path());
manifest->SetString("background_page", "monkey.html");
LoadAndExpectError(Manifest(manifest.get(), ""),
@@ -57,17 +57,19 @@ TEST_F(ExtensionManifestBackgroundTest, BackgroundScripts) {
TEST_F(ExtensionManifestBackgroundTest, BackgroundPage) {
scoped_refptr<Extension> extension(
LoadAndExpectSuccess("background_page.json"));
- ASSERT_TRUE(extension);
- EXPECT_EQ("/foo.html", BackgroundInfo::GetBackgroundURL(extension).path());
- EXPECT_TRUE(BackgroundInfo::AllowJSAccess(extension));
+ ASSERT_TRUE(extension.get());
+ EXPECT_EQ("/foo.html",
+ BackgroundInfo::GetBackgroundURL(extension.get()).path());
+ EXPECT_TRUE(BackgroundInfo::AllowJSAccess(extension.get()));
std::string error;
scoped_ptr<base::DictionaryValue> manifest(
LoadManifest("background_page_legacy.json", &error));
ASSERT_TRUE(manifest.get());
extension = LoadAndExpectSuccess(Manifest(manifest.get(), ""));
- ASSERT_TRUE(extension);
- EXPECT_EQ("/foo.html", BackgroundInfo::GetBackgroundURL(extension).path());
+ ASSERT_TRUE(extension.get());
+ EXPECT_EQ("/foo.html",
+ BackgroundInfo::GetBackgroundURL(extension.get()).path());
manifest->SetInteger(keys::kManifestVersion, 2);
LoadAndExpectWarning(
@@ -78,12 +80,12 @@ TEST_F(ExtensionManifestBackgroundTest, BackgroundPage) {
TEST_F(ExtensionManifestBackgroundTest, BackgroundAllowNoJsAccess) {
scoped_refptr<Extension> extension;
extension = LoadAndExpectSuccess("background_allow_no_js_access.json");
- ASSERT_TRUE(extension);
- EXPECT_FALSE(BackgroundInfo::AllowJSAccess(extension));
+ ASSERT_TRUE(extension.get());
+ EXPECT_FALSE(BackgroundInfo::AllowJSAccess(extension.get()));
extension = LoadAndExpectSuccess("background_allow_no_js_access2.json");
- ASSERT_TRUE(extension);
- EXPECT_FALSE(BackgroundInfo::AllowJSAccess(extension));
+ ASSERT_TRUE(extension.get());
+ EXPECT_FALSE(BackgroundInfo::AllowJSAccess(extension.get()));
}
TEST_F(ExtensionManifestBackgroundTest, BackgroundPageWebRequest) {
@@ -100,8 +102,8 @@ TEST_F(ExtensionManifestBackgroundTest, BackgroundPageWebRequest) {
manifest->SetInteger(keys::kManifestVersion, 2);
scoped_refptr<Extension> extension(
LoadAndExpectSuccess(Manifest(manifest.get(), "")));
- ASSERT_TRUE(extension);
- EXPECT_TRUE(BackgroundInfo::HasLazyBackgroundPage(extension));
+ ASSERT_TRUE(extension.get());
+ EXPECT_TRUE(BackgroundInfo::HasLazyBackgroundPage(extension.get()));
base::ListValue* permissions = new base::ListValue();
permissions->Append(new base::StringValue("webRequest"));

Powered by Google App Engine
This is Rietveld 408576698