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

Unified Diff: chrome/browser/extensions/api/activity_log_private/activity_log_private_api_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/api/activity_log_private/activity_log_private_api_unittest.cc
diff --git a/chrome/browser/extensions/api/activity_log_private/activity_log_private_api_unittest.cc b/chrome/browser/extensions/api/activity_log_private/activity_log_private_api_unittest.cc
index 3c24a1720b1abfa74668000ef8f864e465c0e087..d813ad5e6954b856077b1487966f1ca0907e8438 100644
--- a/chrome/browser/extensions/api/activity_log_private/activity_log_private_api_unittest.cc
+++ b/chrome/browser/extensions/api/activity_log_private/activity_log_private_api_unittest.cc
@@ -4,10 +4,10 @@
#include "chrome/browser/extensions/api/activity_log_private/activity_log_private_api.h"
+#include <memory>
#include <string>
#include <utility>
-#include "base/memory/scoped_ptr.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/extensions/activity_log/activity_action_constants.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -27,7 +27,7 @@ using api::activity_log_private::ExtensionActivity;
typedef testing::Test ActivityLogApiUnitTest;
TEST_F(ActivityLogApiUnitTest, ConvertChromeApiAction) {
- scoped_ptr<base::ListValue> args(new base::ListValue());
+ std::unique_ptr<base::ListValue> args(new base::ListValue());
args->Set(0, new base::StringValue("hello"));
args->Set(1, new base::StringValue("world"));
scoped_refptr<Action> action(new Action(kExtensionId,
@@ -45,7 +45,7 @@ TEST_F(ActivityLogApiUnitTest, ConvertChromeApiAction) {
}
TEST_F(ActivityLogApiUnitTest, ConvertDomAction) {
- scoped_ptr<base::ListValue> args(new base::ListValue());
+ std::unique_ptr<base::ListValue> args(new base::ListValue());
args->Set(0, new base::StringValue("hello"));
args->Set(1, new base::StringValue("world"));
scoped_refptr<Action> action(new Action(kExtensionId,
@@ -66,7 +66,7 @@ TEST_F(ActivityLogApiUnitTest, ConvertDomAction) {
ASSERT_EQ("Title", *(result.page_title.get()));
ASSERT_EQ(kApiCall, *(result.api_call.get()));
ASSERT_EQ(kArgs, *(result.args.get()));
- scoped_ptr<ExtensionActivity::Other> other(std::move(result.other));
+ std::unique_ptr<ExtensionActivity::Other> other(std::move(result.other));
ASSERT_EQ(api::activity_log_private::EXTENSION_ACTIVITY_DOM_VERB_INSERTED,
other->dom_verb);
ASSERT_TRUE(other->prerender.get());

Powered by Google App Engine
This is Rietveld 408576698