[Offline pages] Adding expiration capability to OfflinePageModel

components/offline_pages/offline_page_metadata_store_impl.cc

 // Copyright 2015 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/offline_pages/offline_page_metadata_store_impl.h"
 
 #include <string>
 #include <utility>
 #include <vector>
 
@@ skipping 41 matching lines @@
 #endif
   item_proto->set_file_path(path_string);
   item_proto->set_file_size(item.file_size);
   item_proto->set_creation_time(item.creation_time.ToInternalValue());
   item_proto->set_last_access_time(item.last_access_time.ToInternalValue());
   item_proto->set_access_count(item.access_count);
   item_proto->set_flags(
       static_cast<::offline_pages::OfflinePageEntry_Flags>(item.flags));
   item_proto->set_client_id_name_space(item.client_id.name_space);
   item_proto->set_client_id(item.client_id.id);
+  item_proto->set_expiration_time(item.expiration_time.ToInternalValue());
 }
 
 bool OfflinePageItemFromEntry(const offline_pages::OfflinePageEntry& item_proto,
                               OfflinePageItem* item) {
   DCHECK(item);
   bool has_offline_id =
       item_proto.has_offline_id() || item_proto.has_deprecated_bookmark_id();
   if (!item_proto.has_url() || !has_offline_id || !item_proto.has_version() ||
       !item_proto.has_file_path()) {
     return false;
@@ skipping 18 matching lines @@
         base::Time::FromInternalValue(item_proto.last_access_time());
   }
   if (item_proto.has_access_count()) {
     item->access_count = item_proto.access_count();
   }
   if (item_proto.has_flags()) {
     item->flags = static_cast<OfflinePageItem::Flags>(item_proto.flags());
   }
   item->client_id.name_space = item_proto.client_id_name_space();
   item->client_id.id = item_proto.client_id();
+  if (item_proto.has_expiration_time()) {

[bburns, 2016/05/20 18:23:27]

remove curly braces for one line ifs ?

[fgorski, 2016/05/20 20:54:53]

notice the if content does not fit in a single line, hence no.

+    item->expiration_time =
+        base::Time::FromInternalValue(item_proto.expiration_time());
+  }
 
   return true;
 }
 
 }  // namespace
 
 OfflinePageMetadataStoreImpl::OfflinePageMetadataStoreImpl(
     scoped_refptr<base::SequencedTaskRunner> background_task_runner,
     const base::FilePath& database_dir)
     : background_task_runner_(background_task_runner),
@@ skipping 200 matching lines @@
     bool success) {
   // If the update failed, log and keep going.  We'll try to
   // update next time.
   if (!success) {
     LOG(ERROR) << "Failed to update database";
   }
   NotifyLoadResult(cb, status, result);
 }
 
 }  // namespace offline_pages