diff --git a/buffet/device_registration_info.cc b/buffet/device_registration_info.cc
index 2b42492..a56a15a 100644
--- a/buffet/device_registration_info.cc
+++ b/buffet/device_registration_info.cc
@@ -583,7 +583,7 @@
       FROM_HERE, base::Bind(cb, base::Owned(value.release())));
 }
 
-using ResponsePtr = scoped_ptr<chromeos::http::Response>;
+using ResponsePtr = std::unique_ptr<chromeos::http::Response>;
 
 void SendRequestWithRetries(
     const std::string& method,
@@ -614,7 +614,7 @@
     int status_code = response->GetStatusCode();
     if (status_code >= chromeos::http::status_code::Continue &&
         status_code < chromeos::http::status_code::BadRequest) {
-      success_callback.Run(request_id, response.Pass());
+      success_callback.Run(request_id, std::move(response));
       return;
     }
 
diff --git a/buffet/device_registration_info.h b/buffet/device_registration_info.h
index 6cf5371..4fa4c47 100644
--- a/buffet/device_registration_info.h
+++ b/buffet/device_registration_info.h
@@ -10,7 +10,6 @@
 #include <string>
 #include <utility>
 
-#include <base/callback.h>
 #include <base/macros.h>
 #include <base/memory/weak_ptr.h>
 #include <base/message_loop/message_loop.h>