components/autofill: scoped_ptr -> unique_ptr

components/autofill/content/browser/risk/fingerprint_browsertest.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/autofill/content/browser/risk/fingerprint.h"
 
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 23 matching lines @@
     const gfx::Rect& window_bounds,
     const gfx::Rect& content_bounds,
     const blink::WebScreenInfo& screen_info,
     const std::string& version,
     const std::string& charset,
     const std::string& accept_languages,
     const base::Time& install_time,
     const std::string& app_locale,
     const std::string& user_agent,
     const base::TimeDelta& timeout,
-    const base::Callback<void(scoped_ptr<Fingerprint>)>& callback);
+    const base::Callback<void(std::unique_ptr<Fingerprint>)>& callback);

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

Is it a pattern not to include <memory> for tests? If so, disregard my previous
comments to that effect :)

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

I believe this is a good place to have the #include. Thanks for flagging it!

 
 }  // namespace internal
 
 // Constants that are passed verbatim to the fingerprinter code and should be
 // serialized into the resulting protocol buffer.
 const uint64_t kObfuscatedGaiaId = UINT64_C(16571487432910023183);
 const char kCharset[] = "UTF-8";
 const char kAcceptLanguages[] = "en-US,en";
 const int kScreenColorDepth = 53;
 const char kLocale[] = "en-GB";
 const char kUserAgent[] = "TestUserAgent";
 
 // Geolocation constants that are passed verbatim to the fingerprinter code and
 // should be serialized into the resulting protocol buffer.
 const double kLatitude = -42.0;
 const double kLongitude = 17.3;
 const double kAltitude = 123.4;
 const double kAccuracy = 73.7;
 const int kGeolocationTime = 87;
 
 class AutofillRiskFingerprintTest : public content::ContentBrowserTest {
  public:
   AutofillRiskFingerprintTest()
       : window_bounds_(2, 3, 5, 7),
         content_bounds_(11, 13, 17, 37),
         screen_bounds_(0, 0, 101, 71),
         available_screen_bounds_(0, 11, 101, 60),
         unavailable_screen_bounds_(0, 0, 101, 11) {}
 
-  void GetFingerprintTestCallback(scoped_ptr<Fingerprint> fingerprint) {
+  void GetFingerprintTestCallback(std::unique_ptr<Fingerprint> fingerprint) {
     // Verify that all fields Chrome can fill have been filled.
     ASSERT_TRUE(fingerprint->has_machine_characteristics());
     const Fingerprint::MachineCharacteristics& machine =
         fingerprint->machine_characteristics();
     EXPECT_TRUE(machine.has_operating_system_build());
     EXPECT_TRUE(machine.has_browser_install_time_hours());
     EXPECT_GT(machine.font_size(), 0);
 
     // TODO(isherman): http://crbug.com/358548 and EXPECT_EQ.
     EXPECT_GE(machine.plugin_size(), 0);
@@ skipping 129 matching lines @@
       base::TimeDelta::FromDays(1),  // Ought to be longer than any test run.
       base::Bind(&AutofillRiskFingerprintTest::GetFingerprintTestCallback,
                  base::Unretained(this)));
 
   // Wait for the callback to be called.
   message_loop_.Run();
 }
 
 }  // namespace risk
 }  // namespace autofill