[NTP::SectionOrder] Add category position metric for opened suggestions.

components/ntp_snippets/content_suggestions_metrics.h

 // 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.
 
 #ifndef COMPONENTS_NTP_SNIPPETS_CONTENT_SUGGESTIONS_METRICS_H_
 #define COMPONENTS_NTP_SNIPPETS_CONTENT_SUGGESTIONS_METRICS_H_
 
 #include <utility>
 #include <vector>
 
 #include "base/time/time.h"
 #include "components/ntp_snippets/category.h"
+#include "components/ntp_snippets/content_suggestions_service.h"
 #include "ui/base/window_open_disposition.h"
 
 namespace ntp_snippets {
 namespace metrics {
 
 void OnPageShown(
     const std::vector<std::pair<Category, int>>& suggestions_per_category);
 
 // Should only be called once per NTP for each suggestion.
 void OnSuggestionShown(int global_position,
                        Category category,
-                       int category_position,
+                       int position_in_category,
                        base::Time publish_date,
                        base::Time last_background_fetch_time,
                        float score);
 
-void OnSuggestionOpened(int global_position,
+void OnSuggestionOpened(const ContentSuggestionsService* service,
+                        int global_position,
                         Category category,
-                        int category_position,
+                        int position_in_category,
                         base::Time publish_date,
                         float score,
                         WindowOpenDisposition disposition);
 
 void OnSuggestionMenuOpened(int global_position,
                             Category category,
-                            int category_position,
+                            int position_in_category,
                             base::Time publish_date,
                             float score);
 
 void OnSuggestionDismissed(int global_position,
                            Category category,
-                           int category_position,
+                           int position_in_category,
                            bool visited);
 
 void OnSuggestionTargetVisited(Category category, base::TimeDelta visit_time);
 
 // Should only be called once per NTP for each "more" button.
 void OnMoreButtonShown(Category category, int position);
 
 void OnMoreButtonClicked(Category category, int position);
 
 void OnCategoryDismissed(Category category);
 
 }  // namespace metrics
 }  // namespace ntp_snippets
 
 #endif  // COMPONENTS_NTP_SNIPPETS_CONTENT_SUGGESTIONS_SERVICE_H_