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

Unified Diff: chrome/browser/extensions/activity_log/activity_log_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/activity_log/activity_log_unittest.cc
diff --git a/chrome/browser/extensions/activity_log/activity_log_unittest.cc b/chrome/browser/extensions/activity_log/activity_log_unittest.cc
index 49bcafbd760e39dd68ed6294eaa1fe8a560906c0..e9b4ba3d0ef46a12e8af5d6ecbc2d1d34048b668 100644
--- a/chrome/browser/extensions/activity_log/activity_log_unittest.cc
+++ b/chrome/browser/extensions/activity_log/activity_log_unittest.cc
@@ -2,17 +2,19 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "chrome/browser/extensions/activity_log/activity_log.h"
+
#include <stddef.h>
+#include <memory>
+
#include "base/command_line.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
#include "base/synchronization/waitable_event.h"
#include "build/build_config.h"
#include "chrome/browser/extensions/activity_log/activity_action_constants.h"
-#include "chrome/browser/extensions/activity_log/activity_log.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/test_extension_system.h"
#include "chrome/browser/prerender/prerender_handle.h"
@@ -84,12 +86,12 @@ class ActivityLogTest : public ChromeRenderViewHostTestHarness {
}
static void RetrieveActions_LogAndFetchActions0(
- scoped_ptr<std::vector<scoped_refptr<Action> > > i) {
+ std::unique_ptr<std::vector<scoped_refptr<Action>>> i) {
ASSERT_EQ(0, static_cast<int>(i->size()));
}
static void RetrieveActions_LogAndFetchActions2(
- scoped_ptr<std::vector<scoped_refptr<Action> > > i) {
+ std::unique_ptr<std::vector<scoped_refptr<Action>>> i) {
ASSERT_EQ(2, static_cast<int>(i->size()));
}
@@ -112,7 +114,7 @@ class ActivityLogTest : public ChromeRenderViewHostTestHarness {
}
static void Arguments_Prerender(
- scoped_ptr<std::vector<scoped_refptr<Action> > > i) {
+ std::unique_ptr<std::vector<scoped_refptr<Action>>> i) {
ASSERT_EQ(1U, i->size());
scoped_refptr<Action> last = i->front();
@@ -129,7 +131,7 @@ class ActivityLogTest : public ChromeRenderViewHostTestHarness {
}
static void RetrieveActions_ArgUrlExtraction(
- scoped_ptr<std::vector<scoped_refptr<Action> > > i) {
+ std::unique_ptr<std::vector<scoped_refptr<Action>>> i) {
const base::DictionaryValue* other = NULL;
int dom_verb = -1;
@@ -168,7 +170,7 @@ class ActivityLogTest : public ChromeRenderViewHostTestHarness {
}
static void RetrieveActions_ArgUrlApiCalls(
- scoped_ptr<std::vector<scoped_refptr<Action> > > actions) {
+ std::unique_ptr<std::vector<scoped_refptr<Action>>> actions) {
size_t api_calls_size = arraysize(kUrlApiCalls);
const base::DictionaryValue* other = NULL;
int dom_verb = -1;
@@ -196,7 +198,7 @@ class ActivityLogTest : public ChromeRenderViewHostTestHarness {
#if defined OS_CHROMEOS
chromeos::ScopedTestDeviceSettingsService test_device_settings_service_;
chromeos::ScopedTestCrosSettings test_cros_settings_;
- scoped_ptr<chromeos::ScopedTestUserManager> test_user_manager_;
+ std::unique_ptr<chromeos::ScopedTestUserManager> test_user_manager_;
#endif
};
@@ -207,7 +209,7 @@ TEST_F(ActivityLogTest, Construct) {
TEST_F(ActivityLogTest, LogAndFetchActions) {
ActivityLog* activity_log = ActivityLog::GetInstance(profile());
- scoped_ptr<base::ListValue> args(new base::ListValue());
+ std::unique_ptr<base::ListValue> args(new base::ListValue());
ASSERT_TRUE(GetDatabaseEnabled());
// Write some API calls
@@ -252,7 +254,7 @@ TEST_F(ActivityLogTest, LogPrerender) {
Profile::FromBrowserContext(profile()));
const gfx::Size kSize(640, 480);
- scoped_ptr<prerender::PrerenderHandle> prerender_handle(
+ std::unique_ptr<prerender::PrerenderHandle> prerender_handle(
prerender_manager->AddPrerenderFromOmnibox(
url,
web_contents()->GetController().GetDefaultSessionStorageNamespace(),
@@ -284,7 +286,7 @@ TEST_F(ActivityLogTest, LogPrerender) {
TEST_F(ActivityLogTest, ArgUrlExtraction) {
ActivityLog* activity_log = ActivityLog::GetInstance(profile());
- scoped_ptr<base::ListValue> args(new base::ListValue());
+ std::unique_ptr<base::ListValue> args(new base::ListValue());
base::Time now = base::Time::Now();
@@ -359,7 +361,7 @@ TEST_F(ActivityLogTest, UninstalledExtension) {
.Build();
ActivityLog* activity_log = ActivityLog::GetInstance(profile());
- scoped_ptr<base::ListValue> args(new base::ListValue());
+ std::unique_ptr<base::ListValue> args(new base::ListValue());
ASSERT_TRUE(GetDatabaseEnabled());
// Write some API calls
@@ -388,7 +390,7 @@ TEST_F(ActivityLogTest, UninstalledExtension) {
TEST_F(ActivityLogTest, ArgUrlApiCalls) {
ActivityLog* activity_log = ActivityLog::GetInstance(profile());
- scoped_ptr<base::ListValue> args(new base::ListValue());
+ std::unique_ptr<base::ListValue> args(new base::ListValue());
base::Time now = base::Time::Now();
int api_calls_size = arraysize(kUrlApiCalls);
scoped_refptr<Action> action;

Powered by Google App Engine
This is Rietveld 408576698