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

Unified Diff: components/storage_monitor/storage_monitor_win_unittest.cc

Issue 1884743002: Convert a few components from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: lint 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
« no previous file with comments | « components/storage_monitor/storage_monitor_win.h ('k') | components/storage_monitor/test_storage_monitor.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/storage_monitor/storage_monitor_win_unittest.cc
diff --git a/components/storage_monitor/storage_monitor_win_unittest.cc b/components/storage_monitor/storage_monitor_win_unittest.cc
index 0d94a1ec705e8bfe71612254aa5f6c3edbfb514a..70f6d6c18264a3f8e16902736b350327a9463333 100644
--- a/components/storage_monitor/storage_monitor_win_unittest.cc
+++ b/components/storage_monitor/storage_monitor_win_unittest.cc
@@ -6,13 +6,13 @@
#include <dbt.h>
#include <stddef.h>
+#include <memory>
#include <string>
#include <vector>
#include "base/macros.h"
#include "base/memory/free_deleter.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "base/run_loop.h"
#include "base/strings/utf_string_conversions.h"
#include "base/synchronization/waitable_event.h"
@@ -68,7 +68,7 @@ class StorageMonitorWinTest : public testing::Test {
base::string16* pnp_device_id,
base::string16* storage_object_id);
- scoped_ptr<TestStorageMonitorWin> monitor_;
+ std::unique_ptr<TestStorageMonitorWin> monitor_;
// Weak pointer; owned by the device notifications class.
TestVolumeMountWatcherWin* volume_mount_watcher_;
@@ -213,7 +213,7 @@ void StorageMonitorWinTest::DoMTPDeviceTest(const base::string16& pnp_device_id,
size_t device_id_size = pnp_device_id.size() * sizeof(base::char16);
size_t size = sizeof(DEV_BROADCAST_DEVICEINTERFACE) + device_id_size;
- scoped_ptr<DEV_BROADCAST_DEVICEINTERFACE, base::FreeDeleter>
+ std::unique_ptr<DEV_BROADCAST_DEVICEINTERFACE, base::FreeDeleter>
dev_interface_broadcast(
static_cast<DEV_BROADCAST_DEVICEINTERFACE*>(malloc(size)));
DCHECK(dev_interface_broadcast.get());
« no previous file with comments | « components/storage_monitor/storage_monitor_win.h ('k') | components/storage_monitor/test_storage_monitor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698