Various NTPSnippetsService cleanups:

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 28 matching lines @@
 class SuggestionsProfile;
 }
 
 namespace ntp_snippets {
 
 class NTPSnippetsServiceObserver;
 
 // Stores and vends fresh content data for the NTP.
 class NTPSnippetsService : public KeyedService {
  public:
-  using NTPSnippetStorage = NTPSnippet::PtrVector;
-
   using ImageFetchedCallback =
       base::Callback<void(const std::string& snippet_id, const SkBitmap*)>;
 
   // |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.
   NTPSnippetsService(
       PrefService* pref_service,
       suggestions::SuggestionsService* suggestions_service,
@@ skipping 11 matching lines @@
   // Inherited from KeyedService.
   void Shutdown() override;
 
   // Fetches snippets from the server and adds them to the current ones.
   void FetchSnippets();
   // Fetches snippets from the server for specified hosts (overriding
   // suggestions from the suggestion service) and adds them to the current ones.
   void FetchSnippetsFromHosts(const std::set<std::string>& hosts);
 
   // Available snippets.
-  const NTPSnippetStorage& snippets() const { return snippets_; }
+  const NTPSnippet::PtrVector& snippets() const { return snippets_; }
 
   // Returns the list of snippets previously discarded by the user (that are
   // not expired yet).
-  const NTPSnippetStorage& discarded_snippets() const {
+  const NTPSnippet::PtrVector& discarded_snippets() const {
     return discarded_snippets_;
   }
 
   // Returns the last status message from the snippets fetcher.
   const std::string& last_status() const {
     return snippets_fetcher_->last_status();
   }
 
   // Returns the last json from the snippets fetcher.
   const std::string& last_json() const {
@@ skipping 27 matching lines @@
   void AddObserver(NTPSnippetsServiceObserver* observer);
   void RemoveObserver(NTPSnippetsServiceObserver* observer);
 
   // Returns the maximum number of snippets that will be shown at once.
   static int GetMaxSnippetCountForTesting();
 
  private:
   void OnSuggestionsChanged(const suggestions::SuggestionsProfile& suggestions);
   void OnFetchFinished(NTPSnippetsFetcher::OptionalSnippets snippets);
 
-  // Expects a top-level dictionary containing a "recos" list, each element of
-  // which will be parsed as a snippet.
-  bool LoadFromFetchedValue(const base::Value& value);
-
   // Merges newly available snippets with the previously available list.
-  void MergeSnippets(NTPSnippetStorage new_snippets);
+  void MergeSnippets(NTPSnippet::PtrVector new_snippets);
   // TODO(treib): Investigate a better storage, maybe LevelDB or SQLite?
   void LoadSnippetsFromPrefs();
   void StoreSnippetsToPrefs();
 
   void LoadDiscardedSnippetsFromPrefs();
   void StoreDiscardedSnippetsToPrefs();
 
   std::set<std::string> GetSnippetHostsFromPrefs() const;
   void StoreSnippetHostsToPrefs(const std::set<std::string>& hosts);
 
   void LoadingSnippetsFinished();
 
+  bool did_init_;

[Bernhard Bauer, 2016/05/13 16:04:05]

Alternative would be to use a tri-state enum.

[Bernhard Bauer, 2016/05/17 09:23:40]

^^^ WDYT?

[Marc Treib, 2016/05/17 11:21:18]

I didn't forget, just wanted to sort out the other comment first :)
Done.

+  bool did_shutdown_;
+
   bool enabled_;
 
   PrefService* pref_service_;
 
   suggestions::SuggestionsService* suggestions_service_;
 
   // The SequencedTaskRunner on which file system operations will be run.
   scoped_refptr<base::SequencedTaskRunner> file_task_runner_;
 
   // All current suggestions (i.e. not discarded ones).
-  NTPSnippetStorage snippets_;
+  NTPSnippet::PtrVector snippets_;
 
   // Suggestions that the user discarded. We keep these around until they expire
   // so we won't re-add them on the next fetch.
-  NTPSnippetStorage discarded_snippets_;
+  NTPSnippet::PtrVector discarded_snippets_;
 
   // The ISO 639-1 code of the language used by the application.
   const std::string application_language_code_;
 
   // The observers.
   base::ObserverList<NTPSnippetsServiceObserver> observers_;
 
   // Scheduler for fetching snippets. Not owned.
   NTPSnippetsScheduler* scheduler_;
 
@@ skipping 22 matching lines @@
   // Sent when the service is shutting down.
   virtual void NTPSnippetsServiceShutdown() = 0;
 
  protected:
   virtual ~NTPSnippetsServiceObserver() {}
 };
 
 }  // namespace ntp_snippets
 
 #endif  // COMPONENTS_NTP_SNIPPETS_NTP_SNIPPETS_SERVICE_H_