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

Unified Diff: chrome/browser/supervised_user/legacy/supervised_user_shared_settings_update_unittest.cc

Issue 1878143002: Convert //chrome/browser/supervised_user from scoped_ptr 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/browser/supervised_user/legacy/supervised_user_shared_settings_update_unittest.cc
diff --git a/chrome/browser/supervised_user/legacy/supervised_user_shared_settings_update_unittest.cc b/chrome/browser/supervised_user/legacy/supervised_user_shared_settings_update_unittest.cc
index 59329ac4bbc207ed7e8d5d99ff3fa044c3819991..4db261de1f570eeb349045b12ccd4c46e6809de8 100644
--- a/chrome/browser/supervised_user/legacy/supervised_user_shared_settings_update_unittest.cc
+++ b/chrome/browser/supervised_user/legacy/supervised_user_shared_settings_update_unittest.cc
@@ -2,10 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "chrome/browser/supervised_user/legacy/supervised_user_shared_settings_update.h"
+
+#include <memory>
+
#include "base/bind.h"
-#include "base/memory/scoped_ptr.h"
#include "chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service.h"
-#include "chrome/browser/supervised_user/legacy/supervised_user_shared_settings_update.h"
#include "chrome/test/base/testing_profile.h"
#include "content/public/test/test_browser_thread_bundle.h"
#include "sync/api/sync_change.h"
@@ -24,15 +26,13 @@ class SupervisedUserSharedSettingsUpdateTest : public testing::Test {
content::TestBrowserThreadBundle thread_bundle_;
TestingProfile profile_;
SupervisedUserSharedSettingsService service_;
- scoped_ptr<bool> result_;
+ std::unique_ptr<bool> result_;
};
TEST_F(SupervisedUserSharedSettingsUpdateTest, Success) {
SupervisedUserSharedSettingsUpdate update(
- &service_,
- "abcdef",
- "name",
- scoped_ptr<base::Value>(new base::StringValue("Hans Moleman")),
+ &service_, "abcdef", "name",
+ std::unique_ptr<base::Value>(new base::StringValue("Hans Moleman")),
base::Bind(&SupervisedUserSharedSettingsUpdateTest::OnSettingUpdated,
base::Unretained(this)));
syncer::SyncChangeList changes;
@@ -49,10 +49,8 @@ TEST_F(SupervisedUserSharedSettingsUpdateTest, Success) {
TEST_F(SupervisedUserSharedSettingsUpdateTest, Failure) {
SupervisedUserSharedSettingsUpdate update(
- &service_,
- "abcdef",
- "name",
- scoped_ptr<base::Value>(new base::StringValue("Hans Moleman")),
+ &service_, "abcdef", "name",
+ std::unique_ptr<base::Value>(new base::StringValue("Hans Moleman")),
base::Bind(&SupervisedUserSharedSettingsUpdateTest::OnSettingUpdated,
base::Unretained(this)));
@@ -75,10 +73,8 @@ TEST_F(SupervisedUserSharedSettingsUpdateTest, Failure) {
TEST_F(SupervisedUserSharedSettingsUpdateTest, Cancel) {
{
SupervisedUserSharedSettingsUpdate update(
- &service_,
- "abcdef",
- "name",
- scoped_ptr<base::Value>(new base::StringValue("Hans Moleman")),
+ &service_, "abcdef", "name",
+ std::unique_ptr<base::Value>(new base::StringValue("Hans Moleman")),
base::Bind(&SupervisedUserSharedSettingsUpdateTest::OnSettingUpdated,
base::Unretained(this)));
ASSERT_FALSE(result_);

Powered by Google App Engine
This is Rietveld 408576698