Nuke WebPassOwnPtr<T> and replace it with std::unique_ptr<T>.

components/password_manager/content/renderer/credential_manager_client.cc

 // Copyright 2014 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 "components/password_manager/content/renderer/credential_manager_client.h"
 
 #include <stddef.h>
 
+#include <memory>
+#include <utility>
+
 #include "components/password_manager/content/common/credential_manager_content_utils.h"
 #include "components/password_manager/content/common/credential_manager_messages.h"
 #include "components/password_manager/core/common/credential_manager_types.h"
 #include "content/public/renderer/render_view.h"
 #include "third_party/WebKit/public/platform/WebCredential.h"
 #include "third_party/WebKit/public/platform/WebCredentialManagerError.h"
 #include "third_party/WebKit/public/platform/WebFederatedCredential.h"
-#include "third_party/WebKit/public/platform/WebPassOwnPtr.h"
 #include "third_party/WebKit/public/platform/WebPasswordCredential.h"
 #include "third_party/WebKit/public/web/WebView.h"
 
 namespace password_manager {
 
 namespace {
 
 template <typename T>
 void ClearCallbacksMapWithErrors(T* callbacks_map) {
   typename T::iterator iter(callbacks_map);
@@ skipping 42 matching lines @@
 
 void CredentialManagerClient::OnAcknowledgeRequireUserMediation(
     int request_id) {
   RespondToNotificationCallback(request_id, &require_user_mediation_callbacks_);
 }
 
 void CredentialManagerClient::OnSendCredential(int request_id,
                                                const CredentialInfo& info) {
   RequestCallbacks* callbacks = get_callbacks_.Lookup(request_id);
   DCHECK(callbacks);
-  std::unique_ptr<blink::WebCredential> credential = nullptr;
+  std::unique_ptr<blink::WebCredential> credential;
   switch (info.type) {
     case CredentialType::CREDENTIAL_TYPE_FEDERATED:
       credential.reset(new blink::WebFederatedCredential(
           info.id, info.federation, info.name, info.icon));
       break;
     case CredentialType::CREDENTIAL_TYPE_PASSWORD:
       credential.reset(new blink::WebPasswordCredential(
           info.id, info.password, info.name, info.icon));
       break;
     case CredentialType::CREDENTIAL_TYPE_EMPTY:
       // Intentionally empty; we'll send nullptr to the onSuccess call below.
       break;
   }
-  callbacks->onSuccess(adoptWebPtr(credential.release()));
+  callbacks->onSuccess(std::move(credential));
   get_callbacks_.Remove(request_id);
 }
 
 void CredentialManagerClient::OnRejectCredentialRequest(
     int request_id,
     blink::WebCredentialManagerError error) {
   RequestCallbacks* callbacks = get_callbacks_.Lookup(request_id);
   DCHECK(callbacks);
   callbacks->onError(error);
   get_callbacks_.Remove(request_id);
@@ skipping 35 matching lines @@
     int request_id,
     CredentialManagerClient::NotificationCallbacksMap* map) {
   blink::WebCredentialManagerClient::NotificationCallbacks* callbacks =
       map->Lookup(request_id);
   DCHECK(callbacks);
   callbacks->onSuccess();
   map->Remove(request_id);
 }
 
 }  // namespace password_manager