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

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

Issue 11275088: Remove implicit scoped_refptr operator T* Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 8 years, 2 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/browser/extensions/extension_prefs_unittest.cc
diff --git a/chrome/browser/extensions/extension_prefs_unittest.cc b/chrome/browser/extensions/extension_prefs_unittest.cc
index fb8060e07bfb153c12bef325a062e72066a0daac..a134ba61decbca1821cfa6b7e821aca58acb11df 100644
--- a/chrome/browser/extensions/extension_prefs_unittest.cc
+++ b/chrome/browser/extensions/extension_prefs_unittest.cc
@@ -443,13 +443,13 @@ class ExtensionPrefsActivePermissions : public ExtensionPrefsTest {
EXPECT_EQ(active_perms_->apis(), active->apis());
EXPECT_EQ(active_perms_->explicit_hosts(), active->explicit_hosts());
EXPECT_EQ(active_perms_->scriptable_hosts(), active->scriptable_hosts());
- EXPECT_EQ(*active_perms_, *active);
+ EXPECT_EQ(*active_perms_.get(), *active.get());
}
virtual void Verify() {
scoped_refptr<PermissionSet> permissions(
prefs()->GetActivePermissions(extension_id_));
- EXPECT_EQ(*active_perms_, *permissions);
+ EXPECT_EQ(*active_perms_.get(), *permissions.get());
}
private:
@@ -492,7 +492,7 @@ class ExtensionPrefsBlacklist : public ExtensionPrefsTest {
ExtensionList::const_iterator iter;
for (iter = extensions_.begin(); iter != extensions_.end(); ++iter) {
- EXPECT_TRUE(prefs()->UserMayLoad(*iter, NULL));
+ EXPECT_TRUE(prefs()->UserMayLoad(*iter.get(), NULL));
}
// Blacklist one installed and one not-installed extension id.
std::set<std::string> blacklisted_ids;
@@ -503,12 +503,12 @@ class ExtensionPrefsBlacklist : public ExtensionPrefsTest {
virtual void Verify() {
// Make sure the id we expect to be blacklisted is.
- EXPECT_FALSE(prefs()->UserMayLoad(extensions_[0], NULL));
+ EXPECT_FALSE(prefs()->UserMayLoad(extensions_[0].get(), NULL));
// Make sure the other id's are not blacklisted.
ExtensionList::const_iterator iter;
for (iter = extensions_.begin() + 1; iter != extensions_.end(); ++iter)
- EXPECT_TRUE(prefs()->UserMayLoad(*iter, NULL));
+ EXPECT_TRUE(prefs()->UserMayLoad(*iter.get(), NULL));
// Make sure GetInstalledExtensionsInfo returns only the non-blacklisted
// extensions data.
@@ -618,22 +618,22 @@ class ExtensionPrefsHidingBrowserActions : public ExtensionPrefsTest {
ExtensionList::const_iterator iter;
for (iter = extensions_.begin(); iter != extensions_.end(); ++iter)
- EXPECT_TRUE(prefs()->GetBrowserActionVisibility(*iter));
+ EXPECT_TRUE(prefs()->GetBrowserActionVisibility(*iter.get()));
- prefs()->SetBrowserActionVisibility(extensions_[0], false);
- prefs()->SetBrowserActionVisibility(extensions_[1], true);
+ prefs()->SetBrowserActionVisibility(extensions_[0].get(), false);
+ prefs()->SetBrowserActionVisibility(extensions_[1].get(), true);
}
virtual void Verify() {
// Make sure the one we hid is hidden.
- EXPECT_FALSE(prefs()->GetBrowserActionVisibility(extensions_[0]));
+ EXPECT_FALSE(prefs()->GetBrowserActionVisibility(extensions_[0].get()));
// Make sure the other id's are not hidden.
ExtensionList::const_iterator iter = extensions_.begin() + 1;
for (; iter != extensions_.end(); ++iter) {
SCOPED_TRACE(base::StringPrintf("Loop %d ",
static_cast<int>(iter - extensions_.begin())));
- EXPECT_TRUE(prefs()->GetBrowserActionVisibility(*iter));
+ EXPECT_TRUE(prefs()->GetBrowserActionVisibility(*iter.get()));
}
}
« no previous file with comments | « chrome/browser/extensions/extension_function.h ('k') | chrome/browser/extensions/extension_protocols_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698