Add an ID to the ContentSuggestion

ios/chrome/browser/content_suggestions/content_suggestions_mediator.mm

 // Copyright 2017 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.
 
 #import "ios/chrome/browser/content_suggestions/content_suggestions_mediator.h"
 
 #include "base/mac/bind_objc_block.h"
 #include "base/memory/ptr_util.h"
 #include "base/optional.h"
 #include "base/strings/sys_string_conversions.h"
 #include "components/ntp_snippets/category.h"
 #include "components/ntp_snippets/content_suggestion.h"
 #import "ios/chrome/browser/content_suggestions/content_suggestions_category_wrapper.h"
 #import "ios/chrome/browser/content_suggestions/content_suggestions_service_bridge_observer.h"
 #import "ios/chrome/browser/ui/content_suggestions/content_suggestion.h"
+#import "ios/chrome/browser/ui/content_suggestions/content_suggestion_id.h"
 #import "ios/chrome/browser/ui/content_suggestions/content_suggestions_data_sink.h"
 #import "ios/chrome/browser/ui/content_suggestions/content_suggestions_item.h"
 #import "ios/chrome/browser/ui/content_suggestions/content_suggestions_section_information.h"
 #include "ui/gfx/image/image.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
 #endif
 
 namespace {
@@ skipping 23 matching lines @@
 }
 
 // Converts a ntp_snippets::ContentSuggestion to an Objective-C
 // ContentSuggestion.
 ContentSuggestion* ConvertContentSuggestion(
     const ntp_snippets::ContentSuggestion& contentSuggestion) {
   ContentSuggestion* suggestion = [[ContentSuggestion alloc] init];
   suggestion.title = base::SysUTF16ToNSString(contentSuggestion.title());
   suggestion.text = base::SysUTF16ToNSString(contentSuggestion.snippet_text());
   suggestion.url = contentSuggestion.url();
+  suggestion.suggestionID = [[ContentSuggestionID alloc] init];
+  suggestion.suggestionID.IDInSection =
+      contentSuggestion.id().id_within_category();

[lpromero, 2017/02/21 10:33:34]

Out of curiosity: Here the lingo goes from category to section. Still ok?

[gambard, 2017/02/21 14:37:48]

For me it makes sense because this class is making a transition from the
C++/model world, where the suggestions are in categories, to the Objective-C/UI
world, where the suggestions are items in sections.
And maybe we will have a 1 to N mapping between Categories and Sections.

 
   return suggestion;
 }
 
 // Returns a SectionInformation for a |category|, filled with the
 // |categoryInfo|.
 ContentSuggestionsSectionInformation* SectionInformationFromCategoryInfo(
     const base::Optional<ntp_snippets::CategoryInfo>& categoryInfo,
     const ntp_snippets::Category& category) {
   ContentSuggestionsSectionInformation* sectionInfo =
@@ skipping 109 matching lines @@
 
 - (void)addContentInCategory:(ntp_snippets::Category&)category
                      toArray:(NSMutableArray<ContentSuggestion*>*)contentArray {
   const std::vector<ntp_snippets::ContentSuggestion>& suggestions =
       self.contentService->GetSuggestionsForCategory(category);
   ContentSuggestionsCategoryWrapper* categoryWrapper =
       [[ContentSuggestionsCategoryWrapper alloc] initWithCategory:category];
   for (auto& contentSuggestion : suggestions) {
     ContentSuggestion* suggestion = ConvertContentSuggestion(contentSuggestion);
     suggestion.type = TypeForCategory(category);
-    suggestion.section = self.sectionInformationByCategory[categoryWrapper];
+    suggestion.suggestionID.sectionInfo =
+        self.sectionInformationByCategory[categoryWrapper];
 
     // TODO(crbug.com/686728): fetch the image.
 
     [contentArray addObject:suggestion];
   }
 }
 
 - (void)addSectionInformationForCategory:(ntp_snippets::Category)category {
   base::Optional<ntp_snippets::CategoryInfo> categoryInfo =
       self.contentService->GetCategoryInfo(category);
 
   ContentSuggestionsSectionInformation* sectionInfo =
       SectionInformationFromCategoryInfo(categoryInfo, category);
 
   self.sectionInformationByCategory[[ContentSuggestionsCategoryWrapper
       wrapperWithCategory:category]] = sectionInfo;
 }
 
 @end