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

Unified Diff: chrome/common/extensions/api/extension_action/page_action_manifest_unittest.cc

Issue 1880143002: Convert chrome/common to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . 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/common/extensions/api/extension_action/page_action_manifest_unittest.cc
diff --git a/chrome/common/extensions/api/extension_action/page_action_manifest_unittest.cc b/chrome/common/extensions/api/extension_action/page_action_manifest_unittest.cc
index 236a45c18d9eb6345a7da0092458d0c10f7a8657..6e6d3d92fa77eaaf0168e8618d26eb04547dfb84 100644
--- a/chrome/common/extensions/api/extension_action/page_action_manifest_unittest.cc
+++ b/chrome/common/extensions/api/extension_action/page_action_manifest_unittest.cc
@@ -2,6 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <memory>
+
+#include "base/memory/ptr_util.h"
#include "base/path_service.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/extensions/api/extension_action/action_info.h"
@@ -25,10 +28,10 @@ class PageActionManifestTest : public ChromeManifestTest {
return path.AppendASCII("extensions").AppendASCII("page_action");
}
- scoped_ptr<ActionInfo> LoadAction(const std::string& manifest_filename);
+ std::unique_ptr<ActionInfo> LoadAction(const std::string& manifest_filename);
};
-scoped_ptr<ActionInfo> PageActionManifestTest::LoadAction(
+std::unique_ptr<ActionInfo> PageActionManifestTest::LoadAction(
const std::string& manifest_filename) {
scoped_refptr<Extension> extension = LoadAndExpectSuccess(
manifest_filename.c_str());
@@ -36,11 +39,11 @@ scoped_ptr<ActionInfo> PageActionManifestTest::LoadAction(
ActionInfo::GetPageActionInfo(extension.get());
EXPECT_TRUE(page_action_info);
if (page_action_info) {
- return make_scoped_ptr(new ActionInfo(*page_action_info));
+ return base::WrapUnique(new ActionInfo(*page_action_info));
}
ADD_FAILURE() << "Expected manifest in " << manifest_filename
<< " to include a page_action section.";
- return scoped_ptr<ActionInfo>();
+ return std::unique_ptr<ActionInfo>();
}
TEST_F(PageActionManifestTest, ManifestVersion2) {
@@ -61,7 +64,7 @@ TEST_F(PageActionManifestTest, ManifestVersion2) {
}
TEST_F(PageActionManifestTest, LoadPageActionHelper) {
- scoped_ptr<ActionInfo> action;
+ std::unique_ptr<ActionInfo> action;
// First try with an empty dictionary.
action = LoadAction("page_action_empty.json");

Powered by Google App Engine
This is Rietveld 408576698