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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/extensions/extension_blacklist_browsertest.cc

Issue 16295003: 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/browser/extensions/extension_action_icon_factory_unittest.cc ('k') | chrome/browser/extensions/extension_context_menu_model_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_blacklist_browsertest.cc
diff --git a/chrome/browser/extensions/extension_blacklist_browsertest.cc b/chrome/browser/extensions/extension_blacklist_browsertest.cc
index dcdfb171cba08e065120451da108d4a05b52e370..5172a6748c8f3a5dd560847552e9db2a1c36966e 100644
--- a/chrome/browser/extensions/extension_blacklist_browsertest.cc
+++ b/chrome/browser/extensions/extension_blacklist_browsertest.cc
@@ -260,8 +260,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionBlacklistBrowserTest, PRE_Blacklist) {
chrome::NOTIFICATION_EXTENSION_INSTALLED,
chrome::NOTIFICATION_EXTENSION_LOADED));
- ASSERT_TRUE(extension_a);
- ASSERT_TRUE(extension_b);
+ ASSERT_TRUE(extension_a.get());
+ ASSERT_TRUE(extension_b.get());
ASSERT_EQ(info_a_.id(), extension_a->id());
ASSERT_EQ(info_b_.id(), extension_b->id());
ASSERT_EQ(info_c_.id(), extension_c->id());
@@ -278,17 +278,17 @@ IN_PROC_BROWSER_TEST_F(ExtensionBlacklistBrowserTest, PRE_Blacklist) {
vector_abc.push_back(info_b_.id());
vector_abc.push_back(info_c_.id());
- EXPECT_TRUE(IsSafe(extension_a));
- EXPECT_TRUE(IsSafe(extension_b));
- EXPECT_TRUE(IsSafe(extension_c));
+ EXPECT_TRUE(IsSafe(extension_a.get()));
+ EXPECT_TRUE(IsSafe(extension_b.get()));
+ EXPECT_TRUE(IsSafe(extension_c.get()));
// Blacklist a and b.
blacklist()->SetFromUpdater(vector_ab, "1");
base::RunLoop().RunUntilIdle();
- EXPECT_TRUE(IsBlacklisted(extension_a));
- EXPECT_TRUE(IsBlacklisted(extension_b));
- EXPECT_TRUE(IsSafe(extension_c));
+ EXPECT_TRUE(IsBlacklisted(extension_a.get()));
+ EXPECT_TRUE(IsBlacklisted(extension_b.get()));
+ EXPECT_TRUE(IsSafe(extension_c.get()));
EXPECT_TRUE(notifications.CheckNotifications(
chrome::NOTIFICATION_EXTENSION_UNLOADED,
chrome::NOTIFICATION_EXTENSION_UNLOADED));
@@ -297,28 +297,28 @@ IN_PROC_BROWSER_TEST_F(ExtensionBlacklistBrowserTest, PRE_Blacklist) {
blacklist()->SetFromUpdater(vector_b, "2");
base::RunLoop().RunUntilIdle();
- EXPECT_TRUE(IsSafe(extension_a));
- EXPECT_TRUE(IsBlacklisted(extension_b));
- EXPECT_TRUE(IsSafe(extension_c));
- EXPECT_TRUE(notifications.CheckNotifications(
- chrome::NOTIFICATION_EXTENSION_LOADED));
+ EXPECT_TRUE(IsSafe(extension_a.get()));
+ EXPECT_TRUE(IsBlacklisted(extension_b.get()));
+ EXPECT_TRUE(IsSafe(extension_c.get()));
+ EXPECT_TRUE(
+ notifications.CheckNotifications(chrome::NOTIFICATION_EXTENSION_LOADED));
// Blacklist a then switch with c.
blacklist()->SetFromUpdater(vector_ab, "3");
base::RunLoop().RunUntilIdle();
- EXPECT_TRUE(IsBlacklisted(extension_a));
- EXPECT_TRUE(IsBlacklisted(extension_b));
- EXPECT_TRUE(IsSafe(extension_c));
+ EXPECT_TRUE(IsBlacklisted(extension_a.get()));
+ EXPECT_TRUE(IsBlacklisted(extension_b.get()));
+ EXPECT_TRUE(IsSafe(extension_c.get()));
EXPECT_TRUE(notifications.CheckNotifications(
chrome::NOTIFICATION_EXTENSION_UNLOADED));
blacklist()->SetFromUpdater(vector_bc, "4");
base::RunLoop().RunUntilIdle();
- EXPECT_TRUE(IsSafe(extension_a));
- EXPECT_TRUE(IsBlacklisted(extension_b));
- EXPECT_TRUE(IsBlacklisted(extension_c));
+ EXPECT_TRUE(IsSafe(extension_a.get()));
+ EXPECT_TRUE(IsBlacklisted(extension_b.get()));
+ EXPECT_TRUE(IsBlacklisted(extension_c.get()));
EXPECT_TRUE(notifications.CheckNotifications(
chrome::NOTIFICATION_EXTENSION_LOADED,
chrome::NOTIFICATION_EXTENSION_UNLOADED));
@@ -327,9 +327,9 @@ IN_PROC_BROWSER_TEST_F(ExtensionBlacklistBrowserTest, PRE_Blacklist) {
blacklist()->SetFromUpdater(vector_abc, "5");
base::RunLoop().RunUntilIdle();
- EXPECT_TRUE(IsBlacklisted(extension_a));
- EXPECT_TRUE(IsBlacklisted(extension_b));
- EXPECT_TRUE(IsBlacklisted(extension_c));
+ EXPECT_TRUE(IsBlacklisted(extension_a.get()));
+ EXPECT_TRUE(IsBlacklisted(extension_b.get()));
+ EXPECT_TRUE(IsBlacklisted(extension_c.get()));
EXPECT_TRUE(notifications.CheckNotifications(
chrome::NOTIFICATION_EXTENSION_UNLOADED));
@@ -337,21 +337,21 @@ IN_PROC_BROWSER_TEST_F(ExtensionBlacklistBrowserTest, PRE_Blacklist) {
blacklist()->SetFromUpdater(empty_vector, "6");
base::RunLoop().RunUntilIdle();
- EXPECT_TRUE(IsSafe(extension_a));
- EXPECT_TRUE(IsSafe(extension_b));
- EXPECT_TRUE(IsSafe(extension_c));
- EXPECT_TRUE(notifications.CheckNotifications(
- chrome::NOTIFICATION_EXTENSION_LOADED,
- chrome::NOTIFICATION_EXTENSION_LOADED,
- chrome::NOTIFICATION_EXTENSION_LOADED));
+ EXPECT_TRUE(IsSafe(extension_a.get()));
+ EXPECT_TRUE(IsSafe(extension_b.get()));
+ EXPECT_TRUE(IsSafe(extension_c.get()));
+ EXPECT_TRUE(
+ notifications.CheckNotifications(chrome::NOTIFICATION_EXTENSION_LOADED,
+ chrome::NOTIFICATION_EXTENSION_LOADED,
+ chrome::NOTIFICATION_EXTENSION_LOADED));
// Add a and b back again for the next test.
blacklist()->SetFromUpdater(vector_ab, "7");
base::RunLoop().RunUntilIdle();
- EXPECT_TRUE(IsBlacklisted(extension_a));
- EXPECT_TRUE(IsBlacklisted(extension_b));
- EXPECT_TRUE(IsSafe(extension_c));
+ EXPECT_TRUE(IsBlacklisted(extension_a.get()));
+ EXPECT_TRUE(IsBlacklisted(extension_b.get()));
+ EXPECT_TRUE(IsSafe(extension_c.get()));
EXPECT_TRUE(notifications.CheckNotifications(
chrome::NOTIFICATION_EXTENSION_UNLOADED,
chrome::NOTIFICATION_EXTENSION_UNLOADED));
@@ -365,19 +365,19 @@ IN_PROC_BROWSER_TEST_F(ExtensionBlacklistBrowserTest, Blacklist) {
scoped_refptr<const Extension> extension_a =
extension_service()->blacklisted_extensions()->GetByID(info_a_.id());
- ASSERT_TRUE(extension_a);
+ ASSERT_TRUE(extension_a.get());
scoped_refptr<const Extension> extension_b =
extension_service()->blacklisted_extensions()->GetByID(info_b_.id());
- ASSERT_TRUE(extension_b);
+ ASSERT_TRUE(extension_b.get());
scoped_refptr<const Extension> extension_c =
extension_service()->extensions()->GetByID(info_c_.id());
- ASSERT_TRUE(extension_c);
+ ASSERT_TRUE(extension_c.get());
- EXPECT_TRUE(IsBlacklisted(extension_a));
- EXPECT_TRUE(IsBlacklisted(extension_b));
- EXPECT_TRUE(IsSafe(extension_c));
+ EXPECT_TRUE(IsBlacklisted(extension_a.get()));
+ EXPECT_TRUE(IsBlacklisted(extension_b.get()));
+ EXPECT_TRUE(IsSafe(extension_c.get()));
// Make sure that we can still blacklist c and unblacklist b.
std::vector<std::string> vector_ac(1, extension_a->id());
@@ -385,12 +385,12 @@ IN_PROC_BROWSER_TEST_F(ExtensionBlacklistBrowserTest, Blacklist) {
blacklist()->SetFromUpdater(vector_ac, "8");
base::RunLoop().RunUntilIdle();
- EXPECT_TRUE(IsBlacklisted(extension_a));
- EXPECT_TRUE(IsSafe(extension_b));
- EXPECT_TRUE(IsBlacklisted(extension_c));
+ EXPECT_TRUE(IsBlacklisted(extension_a.get()));
+ EXPECT_TRUE(IsSafe(extension_b.get()));
+ EXPECT_TRUE(IsBlacklisted(extension_c.get()));
EXPECT_TRUE(notifications.CheckNotifications(
- chrome::NOTIFICATION_EXTENSION_LOADED,
- chrome::NOTIFICATION_EXTENSION_UNLOADED));
+ chrome::NOTIFICATION_EXTENSION_LOADED,
+ chrome::NOTIFICATION_EXTENSION_UNLOADED));
}
} // namespace extensions
« no previous file with comments | « chrome/browser/extensions/extension_action_icon_factory_unittest.cc ('k') | chrome/browser/extensions/extension_context_menu_model_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698