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

Unified Diff: components/storage_monitor/storage_monitor_chromeos_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
Index: components/storage_monitor/storage_monitor_chromeos_unittest.cc
diff --git a/components/storage_monitor/storage_monitor_chromeos_unittest.cc b/components/storage_monitor/storage_monitor_chromeos_unittest.cc
index a34c9e89d37297581d39f449d509bea61a0d64d4..415f4a18eefe4a7e94d337bdbad8f56cc20d222e 100644
--- a/components/storage_monitor/storage_monitor_chromeos_unittest.cc
+++ b/components/storage_monitor/storage_monitor_chromeos_unittest.cc
@@ -5,13 +5,14 @@
#include "components/storage_monitor/storage_monitor_chromeos.h"
#include <stdint.h>
+
+#include <memory>
#include <utility>
#include "base/files/file_util.h"
#include "base/files/scoped_temp_dir.h"
#include "base/logging.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/run_loop.h"
#include "base/strings/utf_string_conversions.h"
#include "chromeos/disks/mock_disk_mount_manager.h"
@@ -146,7 +147,7 @@ class StorageMonitorCrosTest : public testing::Test {
base::ScopedTempDir scoped_temp_dir_;
// Objects that talks with StorageMonitorCros.
- scoped_ptr<MockRemovableStorageObserver> mock_storage_observer_;
+ std::unique_ptr<MockRemovableStorageObserver> mock_storage_observer_;
DISALLOW_COPY_AND_ASSIGN(StorageMonitorCrosTest);
};
@@ -173,7 +174,7 @@ void StorageMonitorCrosTest::SetUp() {
// Initialize the test subject.
TestStorageMonitor::Destroy();
monitor_ = new TestStorageMonitorCros();
- scoped_ptr<StorageMonitor> pass_monitor(monitor_);
+ std::unique_ptr<StorageMonitor> pass_monitor(monitor_);
StorageMonitor::SetStorageMonitorForTesting(std::move(pass_monitor));
monitor_->Init();
« no previous file with comments | « components/storage_monitor/storage_monitor_chromeos.h ('k') | components/storage_monitor/storage_monitor_linux.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698