[Suggestions Service] Add support for expiring the SuggestionsStore

components/suggestions/suggestions_service.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/suggestions/suggestions_service.h"
 
 #include <sstream>
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 295 matching lines @@
 
   // Compute suggestions, and dispatch then to requestors. On error still
   // dispatch empty suggestions.
   SuggestionsProfile suggestions;
   if (suggestions_data.empty()) {
     LogResponseState(RESPONSE_EMPTY);
     suggestions_store_->ClearSuggestions();
   } else if (suggestions.ParseFromString(suggestions_data)) {
     LogResponseState(RESPONSE_VALID);
     thumbnail_manager_->Initialize(suggestions);
+    AddDefaultExpiryTimestamps(&suggestions);
     suggestions_store_->StoreSuggestions(suggestions);
   } else {
     LogResponseState(RESPONSE_INVALID);
     suggestions_store_->LoadSuggestions(&suggestions);
   }
 
   FilterAndServe(&suggestions);
   ScheduleBlacklistUpload(true);
 }
 
+
+void SuggestionsService::AddDefaultExpiryTimestamps(
+                          SuggestionsProfile* suggestions){

[manzagop (departed), 2014/07/31 15:31:50]

Indent is wrong. You also want a space between ){

[gayane -on leave until 09-2017, 2014/08/04 13:46:30]

Done.

+
+  // now + 72 hours

[manzagop (departed), 2014/07/31 15:31:50]

I don't think the comment adds much.

[gayane -on leave until 09-2017, 2014/08/04 13:46:30]

I have removed the comments and renamed default_expiry to default_expiry_hours

+  int64 now = (base::Time::NowFromSystemTime()

[manzagop (departed), 2014/07/31 15:31:50]

now_usec?

[gayane -on leave until 09-2017, 2014/08/04 13:46:30]

Done.

+              -base::Time::UnixEpoch()).ToInternalValue();
+  int64 default_expiry = 72;
+  int64 timestamp = now + default_expiry * 60 * 60 * 1000 * 1000;

[manzagop (departed), 2014/07/31 15:31:50]

expiry_timestamp_usec?

[gayane -on leave until 09-2017, 2014/08/04 13:46:30]

Done.

+
+  for (int i = 0; i < suggestions->suggestions_size(); i++) {

[manzagop (departed), 2014/07/31 15:31:50]

Preincrement i. See the other comment for details.

[gayane -on leave until 09-2017, 2014/08/04 13:46:30]

Done.

+    auto* suggestion = suggestions->mutable_suggestions(i);

[manzagop (departed), 2014/07/31 15:31:50]

No auto in chromium afaik.

[gayane -on leave until 09-2017, 2014/08/04 13:46:30]

Done.

+
+    if (!suggestion->has_expiry_ts()){
+        suggestion->set_expiry_ts(timestamp);
+    }
+  }
+}
+
 void SuggestionsService::Shutdown() {
   // Cancel pending request and timeout closure, then serve existing requestors
   // from cache.
   pending_request_.reset(NULL);
   pending_timeout_closure_.reset(NULL);
   ServeFromCache();
 }
 
 void SuggestionsService::ServeFromCache() {
   SuggestionsProfile suggestions;
@@ skipping 43 matching lines @@
   if (last_request_successful) {
     blacklist_delay_sec_ = kBlacklistDefaultDelaySec;
   } else {
     int candidate_delay = blacklist_delay_sec_ * kBlacklistBackoffMultiplier;
     if (candidate_delay < kBlacklistMaxDelaySec)
       blacklist_delay_sec_ = candidate_delay;
   }
 }
 
 }  // namespace suggestions