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

Unified Diff: chrome/common/extensions/manifest_handler_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_handler_unittest.cc
diff --git a/chrome/common/extensions/manifest_handler_unittest.cc b/chrome/common/extensions/manifest_handler_unittest.cc
index ae38d5e4d9c39f1a6e8487a58d7f074502902b5c..bb3a54b2eb14430ed41f11acbe5242d048f1a7ec 100644
--- a/chrome/common/extensions/manifest_handler_unittest.cc
+++ b/chrome/common/extensions/manifest_handler_unittest.cc
@@ -229,7 +229,7 @@ TEST_F(ManifestHandlerTest, FailingHandlers) {
*manifest_a,
Extension::NO_FLAGS,
&error);
- EXPECT_TRUE(extension);
+ EXPECT_TRUE(extension.get());
// Register a handler for "a" that fails.
ParsingWatcher watcher;
@@ -242,7 +242,7 @@ TEST_F(ManifestHandlerTest, FailingHandlers) {
*manifest_a,
Extension::NO_FLAGS,
&error);
- EXPECT_FALSE(extension);
+ EXPECT_FALSE(extension.get());
EXPECT_EQ("A", error);
}
@@ -256,24 +256,24 @@ TEST_F(ManifestHandlerTest, Validate) {
.Set("a", 1)
.Set("b", 2))
.Build();
- EXPECT_TRUE(extension);
+ EXPECT_TRUE(extension.get());
std::string error;
std::vector<InstallWarning> warnings;
// Always validates and fails.
(new TestManifestValidator(false, true, SingleKey("c")))->Register();
- EXPECT_FALSE(ManifestHandler::ValidateExtension(
- extension, &error, &warnings));
+ EXPECT_FALSE(
+ ManifestHandler::ValidateExtension(extension.get(), &error, &warnings));
// This overrides the registered handler for "c".
(new TestManifestValidator(false, false, SingleKey("c")))->Register();
- EXPECT_TRUE(ManifestHandler::ValidateExtension(
- extension, &error, &warnings));
+ EXPECT_TRUE(
+ ManifestHandler::ValidateExtension(extension.get(), &error, &warnings));
// Validates "a" and fails.
(new TestManifestValidator(false, true, SingleKey("a")))->Register();
- EXPECT_FALSE(ManifestHandler::ValidateExtension(
- extension, &error, &warnings));
+ EXPECT_FALSE(
+ ManifestHandler::ValidateExtension(extension.get(), &error, &warnings));
}
} // namespace extensions

Powered by Google App Engine
This is Rietveld 408576698