| Index: components/autofill/content/browser/wallet/wallet_client_unittest.cc
|
| diff --git a/components/autofill/content/browser/wallet/wallet_client_unittest.cc b/components/autofill/content/browser/wallet/wallet_client_unittest.cc
|
| index b3f3aa0dbfc9a16fa8de93b8985c34962f032ea4..a1e6eb15cb0746213087b2a12bbd65ecd49121d4 100644
|
| --- a/components/autofill/content/browser/wallet/wallet_client_unittest.cc
|
| +++ b/components/autofill/content/browser/wallet/wallet_client_unittest.cc
|
| @@ -657,19 +657,19 @@ class MockWalletClientDelegate : public WalletClientDelegate {
|
| is_shipping_required_(true) {}
|
| ~MockWalletClientDelegate() {}
|
|
|
| - virtual const AutofillMetrics& GetMetricLogger() const OVERRIDE {
|
| + virtual const AutofillMetrics& GetMetricLogger() const override {
|
| return metric_logger_;
|
| }
|
|
|
| - virtual std::string GetRiskData() const OVERRIDE {
|
| + virtual std::string GetRiskData() const override {
|
| return "risky business";
|
| }
|
|
|
| - virtual std::string GetWalletCookieValue() const OVERRIDE {
|
| + virtual std::string GetWalletCookieValue() const override {
|
| return "gdToken";
|
| }
|
|
|
| - virtual bool IsShippingAddressRequired() const OVERRIDE {
|
| + virtual bool IsShippingAddressRequired() const override {
|
| return is_shipping_required_;
|
| }
|
|
|
| @@ -723,12 +723,12 @@ class MockWalletClientDelegate : public WalletClientDelegate {
|
| const std::vector<FormFieldError>& form_field_errors));
|
| MOCK_METHOD1(OnWalletError, void(WalletClient::ErrorType error_type));
|
|
|
| - virtual void OnDidGetFullWallet(scoped_ptr<FullWallet> full_wallet) OVERRIDE {
|
| + virtual void OnDidGetFullWallet(scoped_ptr<FullWallet> full_wallet) override {
|
| EXPECT_TRUE(full_wallet);
|
| ++full_wallets_received_;
|
| }
|
| virtual void OnDidGetWalletItems(scoped_ptr<WalletItems> wallet_items)
|
| - OVERRIDE {
|
| + override {
|
| EXPECT_TRUE(wallet_items);
|
| ++wallet_items_received_;
|
| }
|
| @@ -752,12 +752,12 @@ class WalletClientTest : public testing::Test {
|
| base::MessageLoopProxy::current())) {}
|
| virtual ~WalletClientTest() {}
|
|
|
| - virtual void SetUp() OVERRIDE {
|
| + virtual void SetUp() override {
|
| wallet_client_.reset(new WalletClient(
|
| request_context_.get(), &delegate_, GURL(kMerchantUrl)));
|
| }
|
|
|
| - virtual void TearDown() OVERRIDE {
|
| + virtual void TearDown() override {
|
| wallet_client_.reset();
|
| }
|
|
|
|
|