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

Unified Diff: dbus/property_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.cc ('k') | dbus/signal_sender_verification_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: dbus/property_unittest.cc
diff --git a/dbus/property_unittest.cc b/dbus/property_unittest.cc
index f1592849aef12f7197d5cce78f9b9a6256001872..5922554f23d425074d0df17302b019ba63f2a23e 100644
--- a/dbus/property_unittest.cc
+++ b/dbus/property_unittest.cc
@@ -158,12 +158,12 @@ class PropertyTest : 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<Properties> properties_;
- scoped_ptr<TestService> test_service_;
+ std::unique_ptr<Properties> properties_;
+ std::unique_ptr<TestService> test_service_;
// Properties updated.
std::vector<std::string> updated_properties_;
// Last callback received.
@@ -328,7 +328,7 @@ TEST_F(PropertyTest, Invalidate) {
}
TEST(PropertyTestStatic, ReadWriteStringMap) {
- scoped_ptr<Response> message(Response::CreateEmpty());
+ std::unique_ptr<Response> message(Response::CreateEmpty());
MessageWriter writer(message.get());
MessageWriter variant_writer(NULL);
MessageWriter variant_array_writer(NULL);
@@ -362,7 +362,7 @@ TEST(PropertyTestStatic, SerializeStringMap) {
test_map["Map"] = "Test";
test_map["Random"] = "Text";
- scoped_ptr<Response> message(Response::CreateEmpty());
+ std::unique_ptr<Response> message(Response::CreateEmpty());
MessageWriter writer(message.get());
Property<std::map<std::string, std::string>> string_map;
@@ -375,7 +375,7 @@ TEST(PropertyTestStatic, SerializeStringMap) {
}
TEST(PropertyTestStatic, ReadWriteNetAddressArray) {
- scoped_ptr<Response> message(Response::CreateEmpty());
+ std::unique_ptr<Response> message(Response::CreateEmpty());
MessageWriter writer(message.get());
MessageWriter variant_writer(NULL);
MessageWriter variant_array_writer(NULL);
@@ -419,7 +419,7 @@ TEST(PropertyTestStatic, SerializeNetAddressArray) {
test_list.push_back(make_pair(bytes, 16));
}
- scoped_ptr<Response> message(Response::CreateEmpty());
+ std::unique_ptr<Response> message(Response::CreateEmpty());
MessageWriter writer(message.get());
Property<std::vector<std::pair<std::vector<uint8_t>, uint16_t>>> ip_list;
« no previous file with comments | « dbus/property.cc ('k') | dbus/signal_sender_verification_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698