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

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

Issue 508513002: Remove implicit conversions from scoped_refptr to T* in chrome/browser/extensions/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Two more Created 6 years, 4 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_context_menu_model_unittest.cc
diff --git a/chrome/browser/extensions/extension_context_menu_model_unittest.cc b/chrome/browser/extensions/extension_context_menu_model_unittest.cc
index 51d645c40d7514ac7854eb1af2df5c0edb375fb8..47d02db1b8ad126be3cc6c8f630f0e3998c40b16 100644
--- a/chrome/browser/extensions/extension_context_menu_model_unittest.cc
+++ b/chrome/browser/extensions/extension_context_menu_model_unittest.cc
@@ -172,41 +172,41 @@ TEST_F(ExtensionContextMenuModelTest, ExtensionItemTest) {
new ExtensionContextMenuModel(extension.get(), browser.get()));
// There should be no extension items yet.
- EXPECT_EQ(0, CountExtensionItems(menu));
+ EXPECT_EQ(0, CountExtensionItems(menu.get()));
// Add a browser action menu item for |extension| to |manager|.
AddContextItemAndRefreshModel(
- manager, extension.get(), MenuItem::BROWSER_ACTION, menu);
+ manager, extension.get(), MenuItem::BROWSER_ACTION, menu.get());
// Since |extension| has a page action, the browser action menu item should
// not be present.
- EXPECT_EQ(0, CountExtensionItems(menu));
+ EXPECT_EQ(0, CountExtensionItems(menu.get()));
// Add a page action menu item and reset the context menu.
AddContextItemAndRefreshModel(
- manager, extension.get(), MenuItem::PAGE_ACTION, menu);
+ manager, extension.get(), MenuItem::PAGE_ACTION, menu.get());
// The page action item should be present because |extension| has a page
// action.
- EXPECT_EQ(1, CountExtensionItems(menu));
+ EXPECT_EQ(1, CountExtensionItems(menu.get()));
// Create more page action items to test top level menu item limitations.
for (int i = 0; i < api::context_menus::ACTION_MENU_TOP_LEVEL_LIMIT; ++i)
AddContextItemAndRefreshModel(
- manager, extension.get(), MenuItem::PAGE_ACTION, menu);
+ manager, extension.get(), MenuItem::PAGE_ACTION, menu.get());
// The menu should only have a limited number of extension items, since they
// are all top level items, and we limit the number of top level extension
// items.
EXPECT_EQ(api::context_menus::ACTION_MENU_TOP_LEVEL_LIMIT,
- CountExtensionItems(menu));
+ CountExtensionItems(menu.get()));
AddContextItemAndRefreshModel(
- manager, extension.get(), MenuItem::PAGE_ACTION, menu);
+ manager, extension.get(), MenuItem::PAGE_ACTION, menu.get());
// Adding another top level item should not increase the count.
EXPECT_EQ(api::context_menus::ACTION_MENU_TOP_LEVEL_LIMIT,
- CountExtensionItems(menu));
+ CountExtensionItems(menu.get()));
}
// Test that the "show" and "hide" menu items appear correctly in the extension

Powered by Google App Engine
This is Rietveld 408576698