Change NTPSnippetsBridge to read from ContentSuggestionsService

components/ntp_snippets/ntp_snippets_service.h

 // Copyright 2015 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_NTP_SNIPPETS_SERVICE_H_
 #define COMPONENTS_NTP_SNIPPETS_NTP_SNIPPETS_SERVICE_H_
 
 #include <stddef.h>
 
 #include <memory>
@@ skipping 43 matching lines @@
 
 namespace sync_driver {
 class SyncService;
 }
 
 namespace ntp_snippets {
 
 class NTPSnippetsDatabase;
 class NTPSnippetsServiceObserver;
 
 // Stores and vends fresh content data for the NTP.

[Marc Treib, 2016/07/20 09:17:38]

nit: Update the comment, given that it's now a provider (except for the name)?

[Philipp Keck, 2016/07/20 13:20:02]

Done, please read the new comment.

[Marc Treib, 2016/07/20 13:41:11]

Yup, better! :)

 // TODO(pke): Rename this service to ArticleSuggestionsService and move to
 // a subdirectory.
 class NTPSnippetsService : public KeyedService,
                            public image_fetcher::ImageFetcherDelegate,
                            public ContentSuggestionsProvider {
  public:
   // |application_language_code| should be a ISO 639-1 compliant string, e.g.
   // 'en' or 'en-US'. Note that this code should only specify the language, not
   // the locale, so 'en_US' (English language with US locale) and 'en-GB_US'
   // (British English person in the US) are not language codes.
@@ skipping 71 matching lines @@
   std::set<std::string> GetSuggestionsHosts() const;
 
   // Observer accessors.
   void AddObserver(NTPSnippetsServiceObserver* observer);
   void RemoveObserver(NTPSnippetsServiceObserver* observer);
 
   // Returns the maximum number of snippets that will be shown at once.
   static int GetMaxSnippetCountForTesting();
 
  private:
+  friend class NTPSnippetsServiceTest;
   FRIEND_TEST_ALL_PREFIXES(NTPSnippetsServiceTest, HistorySyncStateChanges);
 
   // TODO(pke): As soon as the DisabledReason is replaced with the new status,
   // also remove the old State enum and replace it with
   // ContentSuggestionsCategoryStatus and a similar status diagram.
   // Possible state transitions:
   //  +------- NOT_INITED ------+
   //  |        /       \        |
   //  |   READY <--> DISABLED <-+
   //  |       \        /
@@ skipping 170 matching lines @@
   // If the service might be enabled, DisabledReason::NONE will be provided.
   virtual void NTPSnippetsServiceDisabledReasonChanged(DisabledReason) = 0;
 
  protected:
   virtual ~NTPSnippetsServiceObserver() {}
 };
 
 }  // namespace ntp_snippets
 
 #endif  // COMPONENTS_NTP_SNIPPETS_NTP_SNIPPETS_SERVICE_H_