components/autofill: scoped_ptr -> unique_ptr

components/autofill/content/browser/request_autocomplete_manager_unittest.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/browser/request_autocomplete_manager.h"

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

in another CL,
https://codereview.chromium.org/1857663002/diff/1/chrome/browser/autofill/aut...,
the opposite was done (bringing the tested include in the normal include list).
We should be consistent.

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

I agree, will change the other file.

To explain: this rearranging was done by a script (linked to from the
spreadsheet in this CL description). The script recognises the matching of X.h
with X_unittest.h. This fails in case of
autofill_save_card_infobar_delegate_mobile*, because the header is in
components, while the test in //chrome.

+
 #include <stdint.h>
 
 #include <tuple>

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

do you think we have to include <memory> for the uses of unique_ptr

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

The style guide does not specify this, as far as I saw.
Personally, I would expect every file to #include <memory> if it uses
unique_ptr, with the exception of a .cc file implementing a a function defined
in a header file, and the unique_ptr comes from the signature declared in the
header. If there are alternative views, I'm happy to adjust mine, though.

I'll do my best to be consistent with the above in this CL, however note that
this mechanical change only reflects the state of the code before, modulo
renaming scoped_ptr to unique_ptr and rewriting the associated #includes.

 
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "components/autofill/content/browser/content_autofill_driver.h"
-#include "components/autofill/content/browser/request_autocomplete_manager.h"
 #include "components/autofill/content/common/autofill_messages.h"
 #include "components/autofill/core/browser/test_autofill_client.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/mock_render_process_host.h"
 #include "content/public/test/test_renderer_host.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace autofill {
 
 namespace {
@@ skipping 51 matching lines @@
   bool should_simulate_success_;
 
   DISALLOW_COPY_AND_ASSIGN(CustomTestAutofillClient);
 };
 
 class TestContentAutofillDriver : public ContentAutofillDriver {
  public:
   TestContentAutofillDriver(content::RenderFrameHost* rfh,
                             AutofillClient* client)
       : ContentAutofillDriver(rfh, client, kAppLocale, kDownloadState) {
-    SetAutofillManager(make_scoped_ptr<AutofillManager>(
+    SetAutofillManager(base::WrapUnique<AutofillManager>(
         new TestAutofillManager(this, client)));
   }
   ~TestContentAutofillDriver() override {}
 
   TestAutofillManager* mock_autofill_manager() {
     return static_cast<TestAutofillManager*>(autofill_manager());
   }
 
   DISALLOW_COPY_AND_ASSIGN(TestContentAutofillDriver);
 };
@@ skipping 36 matching lines @@
     std::tuple<blink::WebFormElement::AutocompleteResult, base::string16,
                FormData> autofill_param;
     AutofillMsg_RequestAutocompleteResult::Read(message, &autofill_param);
     *result = std::get<0>(autofill_param);
     process()->sink().ClearMessages();
     return true;
   }
 
  protected:
   CustomTestAutofillClient autofill_client_;
-  scoped_ptr<TestContentAutofillDriver> driver_;
-  scoped_ptr<RequestAutocompleteManager> request_autocomplete_manager_;
+  std::unique_ptr<TestContentAutofillDriver> driver_;
+  std::unique_ptr<RequestAutocompleteManager> request_autocomplete_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(RequestAutocompleteManagerTest);
 };
 
 TEST_F(RequestAutocompleteManagerTest, OnRequestAutocompleteSuccess) {
   blink::WebFormElement::AutocompleteResult result;
   request_autocomplete_manager_->OnRequestAutocomplete(FormData());
   EXPECT_TRUE(GetAutocompleteResultMessage(&result));
   EXPECT_EQ(blink::WebFormElement::AutocompleteResultSuccess, result);
 }
@@ skipping 11 matching lines @@
 TEST_F(RequestAutocompleteManagerTest,
        OnRequestAutocompleteWithAutofillDisabled) {
   blink::WebFormElement::AutocompleteResult result;
   driver_->mock_autofill_manager()->set_autofill_enabled(false);
   request_autocomplete_manager_->OnRequestAutocomplete(FormData());
   EXPECT_TRUE(GetAutocompleteResultMessage(&result));
   EXPECT_EQ(blink::WebFormElement::AutocompleteResultSuccess, result);
 }
 
 }  // namespace autofill