Replace deprecated calls to GetMetadata in Physical Web Zine provider

components/ntp_snippets/physical_web_pages/physical_web_page_suggestions_provider.h

 // Copyright 2016 The Chromium Authors. All rights reserved.

[vitaliii, 2017/01/18 08:03:34]

I have another bug for this change (crbug.com/672012). Please add it to the
description.

[mattreynolds, 2017/01/18 22:26:13]

Done.

 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef COMPONENTS_NTP_SNIPPETS_PHYSICAL_WEB_PAGES_PHYSICAL_WEB_PAGE_SUGGESTIONS_PROVIDER_H_
 #define COMPONENTS_NTP_SNIPPETS_PHYSICAL_WEB_PAGES_PHYSICAL_WEB_PAGE_SUGGESTIONS_PROVIDER_H_
 
 #include <set>
 #include <vector>
 
 #include "base/callback_forward.h"
-#include "base/values.h"
 #include "components/ntp_snippets/category.h"
 #include "components/ntp_snippets/category_status.h"
 #include "components/ntp_snippets/content_suggestion.h"
 #include "components/ntp_snippets/content_suggestions_provider.h"
-#include "components/physical_web/data_source/physical_web_data_source.h"
 #include "components/physical_web/data_source/physical_web_listener.h"
 
 class PrefRegistrySimple;
 class PrefService;
 class GURL;

[vitaliii, 2017/01/18 08:03:34]

Please sort.

[mattreynolds, 2017/01/18 22:26:12]

Done.

 
+namespace physical_web {
+class PhysicalWebDataSource;
+struct Metadata;
+}

[vitaliii, 2017/01/18 08:03:34]

}  // namespace physical_web

[mattreynolds, 2017/01/18 22:26:13]

Done.

+
 namespace ntp_snippets {
 
 // Provides content suggestions from the Physical Web Service.
 class PhysicalWebPageSuggestionsProvider
     : public ContentSuggestionsProvider,
       public physical_web::PhysicalWebListener {
  public:
   PhysicalWebPageSuggestionsProvider(
       ContentSuggestionsProvider::Observer* observer,
       physical_web::PhysicalWebDataSource* physical_web_data_source,
@@ skipping 34 matching lines @@
   // |excluded_ids| and sorted by distance (the closest first). Dismissed
   // suggestions are excluded automatically (no need to add them to
   // |excluded_ids|) and pruned. The raw pages are obtained from Physical Web
   // data source.
   std::vector<ContentSuggestion> GetMostRecentPhysicalWebPagesWithFilter(
       int max_count,
       const std::set<std::string>& excluded_ids);
 
   // Converts an Physical Web page to a ContentSuggestion.
   ContentSuggestion ConvertPhysicalWebPage(
-      const base::DictionaryValue& page) const;
+      const physical_web::Metadata& page) const;
 
   // PhysicalWebListener implementation.
   void OnFound(const GURL& url) override;
   void OnLost(const GURL& url) override;
   void OnDistanceChanged(const GURL& url, double distance_estimate) override;
 
   // Fires the |OnSuggestionInvalidated| event for the suggestion corresponding
   // to the given |page_id| and deletes it from the dismissed IDs list, if
   // necessary.
   void InvalidateSuggestion(const std::string& page_id);
 
   // Reads dismissed IDs from Prefs.
   std::set<std::string> ReadDismissedIDsFromPrefs() const;
 
   // Writes |dismissed_ids| into Prefs.
   void StoreDismissedIDsToPrefs(const std::set<std::string>& dismissed_ids);
 
   CategoryStatus category_status_;
   const Category provided_category_;
   physical_web::PhysicalWebDataSource* physical_web_data_source_;
   PrefService* pref_service_;
 
   DISALLOW_COPY_AND_ASSIGN(PhysicalWebPageSuggestionsProvider);
 };
 
 }  // namespace ntp_snippets
 
 #endif  // COMPONENTS_NTP_SNIPPETS_PHYSICAL_WEB_PAGES_PHYSICAL_WEB_PAGE_SUGGESTIONS_PROVIDER_H_