[NTP Snippets] Introduce ContentSuggestion::ID

components/ntp_snippets/offline_pages/offline_page_suggestions_provider_unittest.cc

 // Copyright 2016 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/ntp_snippets/offline_pages/offline_page_suggestions_provider.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 116 matching lines @@
   }
 
   Category recent_tabs_category() {
     return category_factory_.FromKnownCategory(KnownCategories::RECENT_TABS);
   }
 
   Category downloads_category() {
     return category_factory_.FromKnownCategory(KnownCategories::DOWNLOADS);
   }
 
-  std::string GetDummySuggestionId(Category category, int id) {
-    return provider_->MakeUniqueID(category, base::IntToString(id));
+  ContentSuggestion::ID GetDummySuggestionId(Category category, int id) {
+    return ContentSuggestion::ID(category, base::IntToString(id));
   }
 
   ContentSuggestion CreateDummySuggestion(Category category, int id) {
     std::string strid = base::IntToString(id);
     ContentSuggestion result(
         GetDummySuggestionId(category, id),
         GURL("file:///some/folder/test" + strid + ".mhtml"));
     result.set_title(base::UTF8ToUTF16("http://dummy.com/" + strid));
     return result;
   }
@@ skipping 192 matching lines @@
 }
 
 TEST_F(OfflinePageSuggestionsProviderTest,
        ShouldInvalidateWhenOfflinePageDeleted) {
   model()->mutable_items()->push_back(CreateDummyRecentTab(1));
   model()->mutable_items()->push_back(CreateDummyRecentTab(2));
   model()->mutable_items()->push_back(CreateDummyRecentTab(3));
   FireOfflinePageModelChanged();
 
   // Invalidation of suggestion 2 should be forwarded.
-  EXPECT_CALL(
-      *observer(),
-      OnSuggestionInvalidated(_, recent_tabs_category(),
-                              GetDummySuggestionId(recent_tabs_category(), 2)));
+  EXPECT_CALL(*observer(),
+              OnSuggestionInvalidated(
+                  _, GetDummySuggestionId(recent_tabs_category(), 2)));
   FireOfflinePageDeleted(model()->items().at(1));
 }
 
 TEST_F(OfflinePageSuggestionsProviderTest, ShouldClearDismissedOnInvalidate) {
   model()->mutable_items()->push_back(CreateDummyRecentTab(1));
   model()->mutable_items()->push_back(CreateDummyRecentTab(2));
   model()->mutable_items()->push_back(CreateDummyRecentTab(3));
   FireOfflinePageModelChanged();
   EXPECT_THAT(ReadDismissedIDsFromPrefs(recent_tabs_category()), IsEmpty());
   EXPECT_THAT(ReadDismissedIDsFromPrefs(downloads_category()), IsEmpty());
@@ skipping 25 matching lines @@
   EXPECT_THAT(ReadDismissedIDsFromPrefs(recent_tabs_category()), IsEmpty());
   EXPECT_THAT(ReadDismissedIDsFromPrefs(downloads_category()), SizeIs(1));
 
   model()->mutable_items()->clear();
   FireOfflinePageModelChanged();
   EXPECT_THAT(ReadDismissedIDsFromPrefs(recent_tabs_category()), IsEmpty());
   EXPECT_THAT(ReadDismissedIDsFromPrefs(downloads_category()), IsEmpty());
 }
 
 }  // namespace ntp_snippets