Index: third_party/libaddressinput/chromium/chrome_address_validator_unittest.cc |
diff --git a/third_party/libaddressinput/chromium/chrome_address_validator_unittest.cc b/third_party/libaddressinput/chromium/chrome_address_validator_unittest.cc |
index 54559a4286380b84922a5d52cee877bff0266771..a7f9861247f7a685a64a8b109c8f1a802063a763 100644 |
--- a/third_party/libaddressinput/chromium/chrome_address_validator_unittest.cc |
+++ b/third_party/libaddressinput/chromium/chrome_address_validator_unittest.cc |
@@ -5,8 +5,8 @@ |
#include "third_party/libaddressinput/chromium/chrome_address_validator.h" |
#include <stddef.h> |
- |
#include <string> |
+#include <utility> |
#include <vector> |
#include "base/macros.h" |
@@ -740,12 +740,11 @@ class FailingAddressValidatorTest : public testing::Test, LoadRulesListener { |
class TestAddressValidator : public AddressValidator { |
public: |
// Takes ownership of |source| and |storage|. |
- TestAddressValidator( |
- scoped_ptr< ::i18n::addressinput::Source> source, |
- scoped_ptr< ::i18n::addressinput::Storage> storage, |
- LoadRulesListener* load_rules_listener) |
- : AddressValidator(source.Pass(), |
- storage.Pass(), |
+ TestAddressValidator(scoped_ptr<::i18n::addressinput::Source> source, |
+ scoped_ptr<::i18n::addressinput::Storage> storage, |
+ LoadRulesListener* load_rules_listener) |
+ : AddressValidator(std::move(source), |
+ std::move(storage), |
load_rules_listener) {} |
virtual ~TestAddressValidator() {} |