[NTP Snippets] Introduce ContentSuggestion::ID

components/ntp_snippets/sessions/foreign_sessions_suggestions_provider.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/sessions/foreign_sessions_suggestions_provider.h"
 
 #include <algorithm>
 #include <map>
 #include <tuple>
 #include <utility>
@@ skipping 107 matching lines @@
     Category category) {
   DCHECK_EQ(category, provided_category_);
   return CategoryInfo(l10n_util::GetStringUTF16(
                           IDS_NTP_FOREIGN_SESSIONS_SUGGESTIONS_SECTION_HEADER),
                       ContentSuggestionsCardLayout::MINIMAL_CARD,
                       /*has_more_button=*/true,
                       /*show_if_empty=*/false);
 }
 
 void ForeignSessionsSuggestionsProvider::DismissSuggestion(
-    const std::string& suggestion_id) {
+    const ContentSuggestion::ID& suggestion_id) {
   // TODO(skym): Right now this continuously grows, without clearing out old and
   // irrelevant entries. Could either use a timestamp and expire after a
   // threshold, or compare with current foreign tabs and remove anything that
   // isn't actively blockign a foreign_sessions tab.
   std::set<std::string> dismissed_ids = prefs::ReadDismissedIDsFromPrefs(
       *pref_service_, prefs::kDismissedForeignSessionsSuggestions);
-  dismissed_ids.insert(suggestion_id);
+  dismissed_ids.insert(suggestion_id.within_category_id());
   prefs::StoreDismissedIDsToPrefs(pref_service_,
                                   prefs::kDismissedForeignSessionsSuggestions,
                                   dismissed_ids);
 }
 
 void ForeignSessionsSuggestionsProvider::FetchSuggestionImage(
-    const std::string& suggestion_id,
+    const ContentSuggestion::ID& suggestion_id,
     const ImageFetchedCallback& callback) {
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::Bind(callback, gfx::Image()));
 }
 
 void ForeignSessionsSuggestionsProvider::ClearHistory(
     base::Time begin,
     base::Time end,
     const base::Callback<bool(const GURL& url)>& filter) {
   std::set<std::string> dismissed_ids = prefs::ReadDismissedIDsFromPrefs(
       *pref_service_, prefs::kDismissedForeignSessionsSuggestions);
   for (auto iter = dismissed_ids.begin(); iter != dismissed_ids.end();) {
-    if (filter.Run(GURL(base::StringPiece(*iter)))) {
+    if (filter.Run(GURL(*iter))) {
       iter = dismissed_ids.erase(iter);
     } else {
       ++iter;
     }
   }
   prefs::StoreDismissedIDsToPrefs(pref_service_,
                                   prefs::kDismissedForeignSessionsSuggestions,
                                   dismissed_ids);
 }
 
@@ skipping 104 matching lines @@
 
   for (const SyncedSession* session : foreign_sessions) {
     for (const std::pair<const SessionID::id_type,
                          std::unique_ptr<sessions::SessionWindow>>& key_value :
          session->windows) {
       for (const std::unique_ptr<SessionTab>& tab : key_value.second->tabs) {
         if (tab->navigations.empty())
           continue;
 
         const SerializedNavigationEntry& navigation = tab->navigations.back();
-        const std::string unique_id =
-            MakeUniqueID(provided_category_, navigation.virtual_url().spec());
+        const std::string id = navigation.virtual_url().spec();
         // TODO(skym): Filter out internal pages. Tabs that contain only
         // non-syncable content should never reach the local client, but
         // sometimes the most recent navigation may be internal while one
         // of the previous ones was more valid.
-        if (dismissed_ids.find(unique_id) == dismissed_ids.end() &&
+        if (dismissed_ids.find(id) == dismissed_ids.end() &&
             (base::Time::Now() - tab->timestamp) < max_foreign_tab_age) {
           suggestion_candidates.push_back(
               SessionData{session, tab.get(), &navigation});
         }
       }
     }
   }
   return suggestion_candidates;
 }
 
 ContentSuggestion ForeignSessionsSuggestionsProvider::BuildSuggestion(
     const SessionData& data) {
-  ContentSuggestion suggestion(
-      MakeUniqueID(provided_category_, data.navigation->virtual_url().spec()),
-      data.navigation->virtual_url());
+  ContentSuggestion suggestion(provided_category_,
+                               data.navigation->virtual_url().spec(),
+                               data.navigation->virtual_url());
   suggestion.set_title(data.navigation->title());
   suggestion.set_publish_date(data.tab->timestamp);
   // TODO(skym): It's unclear if this simple approach is sufficient for
   // right-to-left languages.
   // This field is sandwiched between the url's favicon, which is on the left,
   // and the |publish_date|, which is to the right. The domain should always
   // appear next to the favicon.
   suggestion.set_publisher_name(
       base::UTF8ToUTF16(data.navigation->virtual_url().host() + " - " +
                         data.session->session_name));
   return suggestion;
 }
 
 }  // namespace ntp_snippets