[NTP Snippets] Introduce ContentSuggestion::ID

components/ntp_snippets/sessions/foreign_sessions_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/sessions/foreign_sessions_suggestions_provider.h"
 
 #include <map>
 #include <utility>
 
 #include "base/callback_forward.h"
@@ skipping 131 matching lines @@
 
   void TriggerOnChange() {
     std::vector<const SyncedSession*> sessions;
     for (const auto& kv : sessions_map_) {
       sessions.push_back(kv.second.get());
     }
     fake_foreign_sessions_provider_->SetAllForeignSessions(std::move(sessions));
   }
 
   void Dismiss(const std::string& url) {
-    // The url of a given suggestion is used as the |within_category_id|.
-    provider_->DismissSuggestion(provider_->MakeUniqueID(category(), url));
+    // The url of a given suggestion is used as the |id_within_category|.
+    provider_->DismissSuggestion(ContentSuggestion::ID(category(), url));
   }
 
   Category category() {
     return category_factory_.FromKnownCategory(KnownCategories::FOREIGN_TABS);
   }
 
   MockContentSuggestionsProviderObserver* observer() { return &observer_; }
 
  private:
   FakeForeignSessionsProvider* fake_foreign_sessions_provider_;
@@ skipping 153 matching lines @@
   AddTab(0, 0, kUrl1, TimeDelta::FromMinutes(1));
   AddTab(0, 0, kUrl2, TimeDelta::FromMinutes(2));
   AddTab(0, 0, kUrl3, TimeDelta::FromMinutes(3));
   AddTab(0, 0, kUrl4, TimeDelta::FromMinutes(4));
   AddTab(0, 0, kUrl5, TimeDelta::FromMinutes(5));
   AddTab(0, 0, kUrl6, TimeDelta::FromMinutes(6));
   TriggerOnChange();
 }
 
 }  // namespace ntp_snippets