components/autofill: scoped_ptr -> unique_ptr

components/autofill/content/renderer/password_generation_agent.cc

 // Copyright 2013 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/autofill/content/renderer/password_generation_agent.h"
 
+#include <memory>

[Mathieu, 2016/04/04 13:36:17]

and here too, in most other cc files it's omitted if the .h has it (not sure
what the convention is)

[vabr (Chromium), 2016/04/04 14:29:04]

Here, on the other hand, line 207, for example, seems like an implementation
detail independent of the header, so I'd keep it.

+
 #include "base/command_line.h"
 #include "base/logging.h"
-#include "base/memory/scoped_ptr.h"
 #include "components/autofill/content/common/autofill_messages.h"
 #include "components/autofill/content/renderer/form_autofill_util.h"
 #include "components/autofill/content/renderer/password_autofill_agent.h"
 #include "components/autofill/content/renderer/password_form_conversion_utils.h"
 #include "components/autofill/core/common/autofill_switches.h"
 #include "components/autofill/core/common/form_data.h"
 #include "components/autofill/core/common/password_form.h"
 #include "components/autofill/core/common/password_form_generation_data.h"
 #include "components/autofill/core/common/password_generation_util.h"
 #include "content/public/renderer/render_frame.h"
@@ skipping 176 matching lines @@
     return;
 
   blink::WebVector<blink::WebFormElement> forms;
   render_frame()->GetWebFrame()->document().forms(forms);
   for (size_t i = 0; i < forms.size(); ++i) {
     if (forms[i].isNull())
       continue;
 
     // If we can't get a valid PasswordForm, we skip this form because the
     // the password won't get saved even if we generate it.
-    scoped_ptr<PasswordForm> password_form(
+    std::unique_ptr<PasswordForm> password_form(
         CreatePasswordFormFromWebForm(forms[i], nullptr, nullptr));
     if (!password_form.get()) {
       VLOG(2) << "Skipping form as it would not be saved";
       continue;
     }
 
     // Do not generate password for GAIA since it is used to retrieve the
     // generated paswords.
     GURL realm(password_form->signon_realm);
     if (realm == GaiaUrls::GetInstance()->gaia_login_form_realm())
@@ skipping 251 matching lines @@
   blink::WebDocument doc = render_frame()->GetWebFrame()->document();
   if (doc.isNull())
     return;
 
   blink::WebElement focused_element = doc.focusedElement();
   const blink::WebInputElement* element = toWebInputElement(&focused_element);
   if (!element || !element->isPasswordField())
     return;
 
   blink::WebFormElement form = element->form();
-  scoped_ptr<PasswordForm> password_form;
+  std::unique_ptr<PasswordForm> password_form;
   std::vector<blink::WebFormControlElement> control_elements;
   if (!form.isNull()) {
     password_form = CreatePasswordFormFromWebForm(form, nullptr, nullptr);
     control_elements = form_util::ExtractAutofillableElementsInForm(form);
   } else {
     const blink::WebFrame& frame = *render_frame()->GetWebFrame();
     password_form =
         CreatePasswordFormFromUnownedInputElements(frame, nullptr, nullptr);
     control_elements =
         form_util::GetUnownedFormFieldElements(frame.document().all(), nullptr);
   }
 
   if (!password_form)
     return;
 
   generation_element_ = *element;
   std::vector<blink::WebInputElement> password_elements;
   GetAccountCreationPasswordFields(control_elements, &password_elements);
   password_elements = FindPasswordElementsForGeneration(
       password_elements, element->nameForAutofill());
   generation_form_data_.reset(new AccountCreationFormData(
       make_linked_ptr(password_form.release()), password_elements));
   is_manually_triggered_ = true;
   ShowGenerationPopup();
 }
 
 }  // namespace autofill