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

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

Issue 1871713002: Convert //chrome/browser/extensions from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase and fix header Created 4 years, 8 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_action_manager_unittest.cc
diff --git a/chrome/browser/extensions/extension_action_manager_unittest.cc b/chrome/browser/extensions/extension_action_manager_unittest.cc
index 74c5e67b11b8c934dc82362ea2ee688fcde0dbe2..ea58006e556a4a187cb327ccbe79a16196531645 100644
--- a/chrome/browser/extensions/extension_action_manager_unittest.cc
+++ b/chrome/browser/extensions/extension_action_manager_unittest.cc
@@ -31,8 +31,8 @@ class ExtensionActionManagerTest : public testing::Test {
// Build an extension, populating |action_type| key with |action|, and
// "icons" key with |extension_icons|.
scoped_refptr<Extension> BuildExtension(
- scoped_ptr<base::DictionaryValue> extension_icons,
- scoped_ptr<base::DictionaryValue> action,
+ std::unique_ptr<base::DictionaryValue> extension_icons,
+ std::unique_ptr<base::DictionaryValue> action,
const char* action_type);
// Returns true if |action|'s title matches |extension|'s name.
@@ -61,7 +61,7 @@ class ExtensionActionManagerTest : public testing::Test {
ExtensionRegistry* registry_;
int curr_id_;
ExtensionActionManager* manager_;
- scoped_ptr<TestingProfile> profile_;
+ std::unique_ptr<TestingProfile> profile_;
};
ExtensionActionManagerTest::ExtensionActionManagerTest()
@@ -72,8 +72,8 @@ ExtensionActionManagerTest::ExtensionActionManagerTest()
}
scoped_refptr<Extension> ExtensionActionManagerTest::BuildExtension(
- scoped_ptr<base::DictionaryValue> extension_icons,
- scoped_ptr<base::DictionaryValue> action,
+ std::unique_ptr<base::DictionaryValue> extension_icons,
+ std::unique_ptr<base::DictionaryValue> action,
const char* action_type) {
std::string id = base::IntToString(curr_id_++);
scoped_refptr<Extension> extension =
@@ -207,7 +207,7 @@ TEST_F(ExtensionActionManagerTest, GetBestFitActionTest) {
ASSERT_TRUE(extension.get());
// Get a "best fit" browser action for |extension|.
- scoped_ptr<ExtensionAction> action =
+ std::unique_ptr<ExtensionAction> action =
manager()->GetBestFitAction(*extension.get(), ActionInfo::TYPE_BROWSER);
ASSERT_TRUE(action.get());
ASSERT_EQ(action->action_type(), ActionInfo::TYPE_BROWSER);
« no previous file with comments | « chrome/browser/extensions/extension_action_manager.cc ('k') | chrome/browser/extensions/extension_action_runner.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698