[Suggestions Service] Add support for expiring the SuggestionsStore

components/suggestions/suggestions_service_unittest.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 <map>
 #include <sstream>
 #include <string>
 
@@ skipping 76 matching lines @@
 namespace suggestions {
 
 scoped_ptr<SuggestionsProfile> CreateSuggestionsProfile() {
   scoped_ptr<SuggestionsProfile> profile(new SuggestionsProfile());
   ChromeSuggestion* suggestion = profile->add_suggestions();
   suggestion->set_title(kTestTitle);
   suggestion->set_url(kTestUrl);
   return profile.Pass();
 }
 
+// Create one suggestion with expiry timestamp and one without

[Mathieu, 2014/08/04 14:39:10]

*Creates
Also period at the end of the comment.

[gayane -on leave until 09-2017, 2014/08/04 16:34:58]

Done.

+SuggestionsProfile CreateSuggestionsProfileWithExpiryTimestamps() {
+  int64 now = (base::Time::NowFromSystemTime() - base::Time::UnixEpoch())

[Mathieu, 2014/08/04 14:39:10]

Have you tried ToJavaTime? I think it could be combined with NowFromSystemTime

https://code.google.com/p/chromium/codesearch#chromium/src/base/time/time.h&l...

[gayane -on leave until 09-2017, 2014/08/04 16:34:58]

then I would need to do
base::Time::NowFromSystemTime().ToJavaTime() *
base::Time::kMicrosecondsPerMillisecond

which is long as well

+      .ToInternalValue();
+
+  SuggestionsProfile profile;
+  ChromeSuggestion* suggestion = profile.add_suggestions();
+  suggestion->set_title(kTestTitle);
+  suggestion->set_url(kTestUrl);
+  suggestion->set_expiry_ts(now);
+
+  suggestion = profile.add_suggestions();
+  suggestion->set_title(kTestTitle);
+  suggestion->set_url(kTestUrl);
+
+  return profile;
+}
+
 class MockSuggestionsStore : public suggestions::SuggestionsStore {
  public:
   MOCK_METHOD1(LoadSuggestions, bool(SuggestionsProfile*));
   MOCK_METHOD1(StoreSuggestions, bool(const SuggestionsProfile&));
   MOCK_METHOD0(ClearSuggestions, void());
 };
 
 class MockImageManager : public suggestions::ImageManager {
  public:
   MockImageManager() {}
@@ skipping 383 matching lines @@
 
   // Delay increases on failure.
   suggestions_service->UpdateBlacklistDelay(false);
   EXPECT_GT(suggestions_service->blacklist_delay(), initial_delay);
 
   // Delay resets on success.
   suggestions_service->UpdateBlacklistDelay(true);
   EXPECT_EQ(initial_delay, suggestions_service->blacklist_delay());
 }
 
+TEST_F(SuggestionsServiceTest, CheckDefaultTimeStamps) {
+
+  scoped_ptr<SuggestionsService> suggestions_service(
+      CreateSuggestionsServiceWithMocks());
+  SuggestionsProfile suggestions =
+                      CreateSuggestionsProfileWithExpiryTimestamps();

[Mathieu, 2014/08/04 14:39:10]

Indentation is off. Indent 4 from the start of the previous line (6 total).

[gayane -on leave until 09-2017, 2014/08/04 16:34:58]

Done.

+  int64 now_usec = (base::Time::NowFromSystemTime() - base::Time::UnixEpoch())
+      .ToInternalValue();
+  int64 default_timestamp_usec = now_usec +
+      SuggestionsService::default_expiry_usec;

[Mathieu, 2014/08/04 14:39:10]

do you need the "SuggestionsService::"?

[gayane -on leave until 09-2017, 2014/08/04 16:34:58]

Done.

+  suggestions_service->SetDefaultExpiryTimestamps(&suggestions,
+                                                  default_timestamp_usec);
+
+  EXPECT_NE(suggestions.suggestions(0).expiry_ts(), default_timestamp_usec);
+  EXPECT_EQ(suggestions.suggestions(1).expiry_ts(), default_timestamp_usec);
+}
 }  // namespace suggestions