Convert //dbus from scoped_ptr to std::unique_ptr

dbus/test_service.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "dbus/test_service.h"
 
 #include <stdint.h>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 291 matching lines @@
     LOG(ERROR) << "The number of methods does not match";
   }
   message_loop->Run();
 }
 
 void TestService::Echo(MethodCall* method_call,
                        ExportedObject::ResponseSender response_sender) {
   MessageReader reader(method_call);
   std::string text_message;
   if (!reader.PopString(&text_message)) {
-    response_sender.Run(scoped_ptr<Response>());
+    response_sender.Run(std::unique_ptr<Response>());
     return;
   }
 
-  scoped_ptr<Response> response = Response::FromMethodCall(method_call);
+  std::unique_ptr<Response> response = Response::FromMethodCall(method_call);
   MessageWriter writer(response.get());
   writer.AppendString(text_message);
   response_sender.Run(std::move(response));
 }
 
 void TestService::SlowEcho(MethodCall* method_call,
                            ExportedObject::ResponseSender response_sender) {
   base::PlatformThread::Sleep(TestTimeouts::tiny_timeout());
   Echo(method_call, response_sender);
 }
 
 void TestService::AsyncEcho(MethodCall* method_call,
                             ExportedObject::ResponseSender response_sender) {
   // Schedule a call to Echo() to send an asynchronous response after we return.
   message_loop()->PostDelayedTask(FROM_HERE,
                                   base::Bind(&TestService::Echo,
                                              base::Unretained(this),
                                              method_call,
                                              response_sender),
                                   TestTimeouts::tiny_timeout());
 }
 
 void TestService::BrokenMethod(MethodCall* method_call,
                                ExportedObject::ResponseSender response_sender) {
-  response_sender.Run(scoped_ptr<Response>());
+  response_sender.Run(std::unique_ptr<Response>());
 }
 
 
 void TestService::GetAllProperties(
     MethodCall* method_call,
     ExportedObject::ResponseSender response_sender) {
   MessageReader reader(method_call);
   std::string interface;
   if (!reader.PopString(&interface)) {
-    response_sender.Run(scoped_ptr<Response>());
+    response_sender.Run(std::unique_ptr<Response>());
     return;
   }
 
-  scoped_ptr<Response> response = Response::FromMethodCall(method_call);
+  std::unique_ptr<Response> response = Response::FromMethodCall(method_call);
   MessageWriter writer(response.get());
 
   AddPropertiesToWriter(&writer);
 
   response_sender.Run(std::move(response));
 }
 
 void TestService::GetProperty(MethodCall* method_call,
                               ExportedObject::ResponseSender response_sender) {
   MessageReader reader(method_call);
   std::string interface;
   if (!reader.PopString(&interface)) {
-    response_sender.Run(scoped_ptr<Response>());
+    response_sender.Run(std::unique_ptr<Response>());
     return;
   }
 
   std::string name;
   if (!reader.PopString(&name)) {
-    response_sender.Run(scoped_ptr<Response>());
+    response_sender.Run(std::unique_ptr<Response>());
     return;
   }
 
   if (name == "Name") {
     // Return the previous value for the "Name" property:
     // Variant<"TestService">
-    scoped_ptr<Response> response = Response::FromMethodCall(method_call);
+    std::unique_ptr<Response> response = Response::FromMethodCall(method_call);
     MessageWriter writer(response.get());
 
     writer.AppendVariantOfString("TestService");
 
     response_sender.Run(std::move(response));
   } else if (name == "Version") {
     // Return a new value for the "Version" property:
     // Variant<20>
-    scoped_ptr<Response> response = Response::FromMethodCall(method_call);
+    std::unique_ptr<Response> response = Response::FromMethodCall(method_call);
     MessageWriter writer(response.get());
 
     writer.AppendVariantOfInt16(20);
 
     response_sender.Run(std::move(response));
   } else if (name == "Methods") {
     // Return the previous value for the "Methods" property:
     // Variant<["Echo", "SlowEcho", "AsyncEcho", "BrokenMethod"]>
-    scoped_ptr<Response> response = Response::FromMethodCall(method_call);
+    std::unique_ptr<Response> response = Response::FromMethodCall(method_call);
     MessageWriter writer(response.get());
     MessageWriter variant_writer(NULL);
     MessageWriter variant_array_writer(NULL);
 
     writer.OpenVariant("as", &variant_writer);
     variant_writer.OpenArray("s", &variant_array_writer);
     variant_array_writer.AppendString("Echo");
     variant_array_writer.AppendString("SlowEcho");
     variant_array_writer.AppendString("AsyncEcho");
     variant_array_writer.AppendString("BrokenMethod");
     variant_writer.CloseContainer(&variant_array_writer);
     writer.CloseContainer(&variant_writer);
 
     response_sender.Run(std::move(response));
   } else if (name == "Objects") {
     // Return the previous value for the "Objects" property:
     // Variant<[objectpath:"/TestObjectPath"]>
-    scoped_ptr<Response> response = Response::FromMethodCall(method_call);
+    std::unique_ptr<Response> response = Response::FromMethodCall(method_call);
     MessageWriter writer(response.get());
     MessageWriter variant_writer(NULL);
     MessageWriter variant_array_writer(NULL);
 
     writer.OpenVariant("ao", &variant_writer);
     variant_writer.OpenArray("o", &variant_array_writer);
     variant_array_writer.AppendObjectPath(ObjectPath("/TestObjectPath"));
     variant_writer.CloseContainer(&variant_array_writer);
     writer.CloseContainer(&variant_writer);
 
     response_sender.Run(std::move(response));
   } else if (name == "Bytes") {
     // Return the previous value for the "Bytes" property:
     // Variant<[0x54, 0x65, 0x73, 0x74]>
-    scoped_ptr<Response> response = Response::FromMethodCall(method_call);
+    std::unique_ptr<Response> response = Response::FromMethodCall(method_call);
     MessageWriter writer(response.get());
     MessageWriter variant_writer(NULL);
     MessageWriter variant_array_writer(NULL);
 
     writer.OpenVariant("ay", &variant_writer);
     const uint8_t bytes[] = {0x54, 0x65, 0x73, 0x74};
     variant_writer.AppendArrayOfBytes(bytes, sizeof(bytes));
     writer.CloseContainer(&variant_writer);
 
     response_sender.Run(std::move(response));
   } else {
     // Return error.
-    response_sender.Run(scoped_ptr<Response>());
+    response_sender.Run(std::unique_ptr<Response>());
     return;
   }
 }
 
 void TestService::SetProperty(MethodCall* method_call,
                               ExportedObject::ResponseSender response_sender) {
   MessageReader reader(method_call);
   std::string interface;
   if (!reader.PopString(&interface)) {
-    response_sender.Run(scoped_ptr<Response>());
+    response_sender.Run(std::unique_ptr<Response>());
     return;
   }
 
   std::string name;
   if (!reader.PopString(&name)) {
-    response_sender.Run(scoped_ptr<Response>());
+    response_sender.Run(std::unique_ptr<Response>());
     return;
   }
 
   if (name != "Name") {
-    response_sender.Run(scoped_ptr<Response>());
+    response_sender.Run(std::unique_ptr<Response>());
     return;
   }
 
   std::string value;
   if (!reader.PopVariantOfString(&value)) {
-    response_sender.Run(scoped_ptr<Response>());
+    response_sender.Run(std::unique_ptr<Response>());
     return;
   }
 
   SendPropertyChangedSignal(value);
 
   response_sender.Run(Response::FromMethodCall(method_call));
 }
 
 void TestService::PerformAction(
       MethodCall* method_call,
       ExportedObject::ResponseSender response_sender) {
   MessageReader reader(method_call);
   std::string action;
   ObjectPath object_path;
   if (!reader.PopString(&action) || !reader.PopObjectPath(&object_path)) {
-    response_sender.Run(scoped_ptr<Response>());
+    response_sender.Run(std::unique_ptr<Response>());
     return;
   }
 
   if (action == "AddObject") {
     AddObject(object_path);
   } else if (action == "RemoveObject") {
     RemoveObject(object_path);
   } else if (action == "SetSendImmediatePropertiesChanged") {
     SetSendImmediatePropertiesChanged();
   } else if (action == "ReleaseOwnership") {
     ReleaseOwnership(base::Bind(&TestService::PerformActionResponse,
                                 base::Unretained(this),
                                 method_call, response_sender));
     return;
   } else if (action == "Ownership") {
     ReleaseOwnership(base::Bind(&TestService::OwnershipReleased,
                                 base::Unretained(this),
                                 method_call, response_sender));
     return;
   } else if (action == "InvalidateProperty") {
     SendPropertyInvalidatedSignal();
   }
 
-  scoped_ptr<Response> response = Response::FromMethodCall(method_call);
+  std::unique_ptr<Response> response = Response::FromMethodCall(method_call);
   response_sender.Run(std::move(response));
 }
 
 void TestService::PerformActionResponse(
     MethodCall* method_call,
     ExportedObject::ResponseSender response_sender) {
-  scoped_ptr<Response> response = Response::FromMethodCall(method_call);
+  std::unique_ptr<Response> response = Response::FromMethodCall(method_call);
   response_sender.Run(std::move(response));
 }
 
 void TestService::OwnershipReleased(
     MethodCall* method_call,
     ExportedObject::ResponseSender response_sender) {
   RequestOwnership(base::Bind(&TestService::OwnershipRegained,
                               base::Unretained(this),
                               method_call, response_sender));
 }
 
 
 void TestService::OwnershipRegained(
     MethodCall* method_call,
     ExportedObject::ResponseSender response_sender,
     bool success) {
   PerformActionResponse(method_call, response_sender);
 }
 
 
 void TestService::GetManagedObjects(
     MethodCall* method_call,
     ExportedObject::ResponseSender response_sender) {
-  scoped_ptr<Response> response = Response::FromMethodCall(method_call);
+  std::unique_ptr<Response> response = Response::FromMethodCall(method_call);
   MessageWriter writer(response.get());
 
   // The managed objects response is a dictionary of object paths identifying
   // the object(s) with a dictionary of strings identifying the interface(s)
   // they implement and then a dictionary of property values.
   //
   // Thus this looks something like:
   //
   // {
   //   "/org/chromium/TestObject": {
@@ skipping 188 matching lines @@
   MessageWriter invalidated_array_writer(NULL);
 
   writer.OpenArray("s", &invalidated_array_writer);
   invalidated_array_writer.AppendString("Name");
   writer.CloseContainer(&invalidated_array_writer);
 
   exported_object_->SendSignal(&signal);
 }
 
 }  // namespace dbus