[Payments] Set cached manifest expiration date

components/payments/android/payment_manifest_web_data_service.cc

 // Copyright 2017 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/payments/android/payment_manifest_web_data_service.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 
 namespace payments {
@@ skipping 54 matching lines @@
       FROM_HERE,
       base::Bind(&PaymentManifestWebDataService::GetPaymentWebAppManifestImpl,
                  this, web_app),
       consumer);
 }
 
 std::unique_ptr<WDTypedResult>
 PaymentManifestWebDataService::GetPaymentWebAppManifestImpl(
     const std::string& web_app,
     WebDatabase* db) {
+  RemoveExpiredData(db);
   return base::MakeUnique<
       WDResult<std::vector<mojom::WebAppManifestSectionPtr>>>(
       PAYMENT_WEB_APP_MANIFEST,
       WebAppManifestSectionTable::FromWebDatabase(db)->GetWebAppManifest(
           web_app));
 }
 
 WebDataServiceBase::Handle
 PaymentManifestWebDataService::GetPaymentMethodManifest(
     const std::string& payment_method,
     WebDataServiceConsumer* consumer) {
   return wdbs_->ScheduleDBTaskWithResult(
       FROM_HERE,
       base::Bind(&PaymentManifestWebDataService::GetPaymentMethodManifestImpl,
                  this, payment_method),
       consumer);
 }
 
 std::unique_ptr<WDTypedResult>
 PaymentManifestWebDataService::GetPaymentMethodManifestImpl(
     const std::string& payment_method,
     WebDatabase* db) {
+  RemoveExpiredData(db);
   return base::MakeUnique<WDResult<std::vector<std::string>>>(
       PAYMENT_METHOD_MANIFEST,
       PaymentMethodManifestTable::FromWebDatabase(db)->GetManifest(
           payment_method));
 }
 
+void PaymentManifestWebDataService::RemoveExpiredData(WebDatabase* db) {
+  PaymentMethodManifestTable::FromWebDatabase(db)->RemoveExpiredData();
+  WebAppManifestSectionTable::FromWebDatabase(db)->RemoveExpiredData();
+}
+
 }  // namespace payments