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

Unified Diff: dbus/signal_sender_verification_unittest.cc

Issue 1867253002: Convert //dbus from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: IWYU fixes in //device 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 | « dbus/property_unittest.cc ('k') | dbus/test_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: dbus/signal_sender_verification_unittest.cc
diff --git a/dbus/signal_sender_verification_unittest.cc b/dbus/signal_sender_verification_unittest.cc
index 785948a1f2b3b88244c6bca6389a9c45e2f95446..3b2cf6f50737ac8bdd9e670ea014ec42f0803683 100644
--- a/dbus/signal_sender_verification_unittest.cc
+++ b/dbus/signal_sender_verification_unittest.cc
@@ -2,8 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <memory>
+
#include "base/bind.h"
-#include "base/memory/scoped_ptr.h"
#include "base/message_loop/message_loop.h"
#include "base/metrics/histogram.h"
#include "base/metrics/histogram_samples.h"
@@ -168,12 +169,12 @@ class SignalSenderVerificationTest : public testing::Test {
}
base::MessageLoop message_loop_;
- scoped_ptr<base::RunLoop> run_loop_;
- scoped_ptr<base::Thread> dbus_thread_;
+ std::unique_ptr<base::RunLoop> run_loop_;
+ std::unique_ptr<base::Thread> dbus_thread_;
scoped_refptr<Bus> bus_;
ObjectProxy* object_proxy_;
- scoped_ptr<TestService> test_service_;
- scoped_ptr<TestService> test_service2_;
+ std::unique_ptr<TestService> test_service_;
+ std::unique_ptr<TestService> test_service2_;
// Text message from "Test" signal.
std::string test_signal_string_;
@@ -201,7 +202,7 @@ TEST_F(SignalSenderVerificationTest, DISABLED_TestSignalRejected) {
UMA_HISTOGRAM_COUNTS("DBus.RejectedSignalCount", 0);
base::HistogramBase* reject_signal_histogram =
base::StatisticsRecorder::FindHistogram("DBus.RejectedSignalCount");
- scoped_ptr<base::HistogramSamples> samples1(
+ std::unique_ptr<base::HistogramSamples> samples1(
reject_signal_histogram->SnapshotSamples());
const char kNewMessage[] = "hello, new world";
@@ -211,7 +212,7 @@ TEST_F(SignalSenderVerificationTest, DISABLED_TestSignalRejected) {
// Sleep to have message delivered to the client via the D-Bus service.
base::PlatformThread::Sleep(TestTimeouts::action_timeout());
- scoped_ptr<base::HistogramSamples> samples2(
+ std::unique_ptr<base::HistogramSamples> samples2(
reject_signal_histogram->SnapshotSamples());
ASSERT_EQ("", test_signal_string_);
« no previous file with comments | « dbus/property_unittest.cc ('k') | dbus/test_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698