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

Unified Diff: chrome/browser/chromeos/settings/scoped_cros_settings_test_helper.h

Issue 1870793002: Convert //chrome/browser/chromeos from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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/chromeos/settings/scoped_cros_settings_test_helper.h
diff --git a/chrome/browser/chromeos/settings/scoped_cros_settings_test_helper.h b/chrome/browser/chromeos/settings/scoped_cros_settings_test_helper.h
index 86a07bd0c9f108efd2f83377c7e141a0593e188f..d5fda0a34009829f22b9952d19cbeba5dd9a3bd8 100644
--- a/chrome/browser/chromeos/settings/scoped_cros_settings_test_helper.h
+++ b/chrome/browser/chromeos/settings/scoped_cros_settings_test_helper.h
@@ -5,10 +5,10 @@
#ifndef CHROME_BROWSER_CHROMEOS_SETTINGS_SCOPED_CROS_SETTINGS_TEST_HELPER_H_
#define CHROME_BROWSER_CHROMEOS_SETTINGS_SCOPED_CROS_SETTINGS_TEST_HELPER_H_
+#include <memory>
#include <string>
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "chrome/browser/chromeos/settings/stub_cros_settings_provider.h"
#include "chromeos/settings/cros_settings_provider.h"
@@ -42,7 +42,7 @@ class ScopedCrosSettingsTestHelper {
// Method to create an owner settings service that uses
// |stub_settings_provider_| as settings write path.
- scoped_ptr<FakeOwnerSettingsService> CreateOwnerSettingsService(
+ std::unique_ptr<FakeOwnerSettingsService> CreateOwnerSettingsService(
Profile* profile);
// These methods simply call the according |stub_settings_provider_| method.
@@ -68,8 +68,9 @@ class ScopedCrosSettingsTestHelper {
private:
// Helpers used to mock out cros settings.
- scoped_ptr<ScopedTestDeviceSettingsService> test_device_settings_service_;
- scoped_ptr<ScopedTestCrosSettings> test_cros_settings_;
+ std::unique_ptr<ScopedTestDeviceSettingsService>
+ test_device_settings_service_;
+ std::unique_ptr<ScopedTestCrosSettings> test_cros_settings_;
CrosSettingsProvider* real_settings_provider_ = nullptr;
StubCrosSettingsProvider stub_settings_provider_;

Powered by Google App Engine
This is Rietveld 408576698