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

Unified Diff: chrome/browser/chromeos/printer_detector/printer_detector_unittest.cc

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/printer_detector/printer_detector_unittest.cc
diff --git a/chrome/browser/chromeos/printer_detector/printer_detector_unittest.cc b/chrome/browser/chromeos/printer_detector/printer_detector_unittest.cc
index 0f36776e8928f0a2d927940b12d4afb9f44c9670..2964dc1ff4e7026af111d3bd7c6376158467fe5a 100644
--- a/chrome/browser/chromeos/printer_detector/printer_detector_unittest.cc
+++ b/chrome/browser/chromeos/printer_detector/printer_detector_unittest.cc
@@ -6,10 +6,10 @@
#include <stdint.h>
+#include <memory>
#include <utility>
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/run_loop.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
@@ -70,9 +70,9 @@ class FakeDeviceClient : public device::DeviceClient {
DISALLOW_COPY_AND_ASSIGN(FakeDeviceClient);
};
-scoped_ptr<KeyedService> CreatePrinterDetector(
+std::unique_ptr<KeyedService> CreatePrinterDetector(
content::BrowserContext* context) {
- return scoped_ptr<KeyedService>(
+ return std::unique_ptr<KeyedService>(
new chromeos::PrinterDetector(Profile::FromBrowserContext(context)));
}
@@ -129,8 +129,8 @@ class PrinterDetectorAppSearchEnabledTest : public testing::Test {
// Creates a test extension with the provided permissions.
scoped_refptr<extensions::Extension> CreateTestExtension(
- scoped_ptr<base::ListValue> permissions_builder,
- scoped_ptr<base::DictionaryValue> usb_printers_builder) {
+ std::unique_ptr<base::ListValue> permissions_builder,
+ std::unique_ptr<base::DictionaryValue> usb_printers_builder) {
return extensions::ExtensionBuilder()
.SetID("fake_extension_id")
.SetManifest(
@@ -158,7 +158,7 @@ class PrinterDetectorAppSearchEnabledTest : public testing::Test {
user_manager::FakeUserManager* user_manager_;
chromeos::ScopedUserManagerEnabler user_manager_enabler_;
device::MockUsbService usb_service_;
- scoped_ptr<TestingProfile> profile_;
+ std::unique_ptr<TestingProfile> profile_;
FakeDeviceClient device_client_;
DISALLOW_COPY_AND_ASSIGN(PrinterDetectorAppSearchEnabledTest);

Powered by Google App Engine
This is Rietveld 408576698