[NTP Snippets] Cleanup: remove NTPSnippetsService::is_loaded()

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 <string>
@@ skipping 54 matching lines @@
                      const ParseJSONCallback& parse_json_callback);
   ~NTPSnippetsService() override;
 
   static void RegisterProfilePrefs(PrefRegistrySimple* registry);
 
   void Init(bool enabled);
 
   // Inherited from KeyedService.
   void Shutdown() override;
 
-  // True once the data is loaded in memory and available to loop over.
-  bool is_loaded() { return loaded_; }
-
   // Fetches snippets from the server and adds them to the current ones.
   void FetchSnippets();
 
   // Discards the snippet with the given |url|, if it exists. Returns true iff
   // a snippet was discarded.
   bool DiscardSnippet(const GURL& url);
 
   // Observer accessors.
   void AddObserver(NTPSnippetsServiceObserver* observer);
   void RemoveObserver(NTPSnippetsServiceObserver* observer);
 
-  // Number of snippets available. Can only be called when is_loaded() is true.
-  size_t size() const {
-    DCHECK(loaded_);
-    return snippets_.size();
-  }
+  // Number of snippets available.
+  size_t size() const { return snippets_.size(); }
 
   // The snippets can be iterated upon only via a const_iterator. Recommended
   // way to iterate is as follows:
   //
   // NTPSnippetsService* service; // Assume is set.
   //  for (auto& snippet : *service) {
   //    // |snippet| here is a const object.
   //  }
-  const_iterator begin() const {
-    DCHECK(loaded_);
-    return const_iterator(snippets_.begin());
-  }
-  const_iterator end() const {
-    DCHECK(loaded_);
-    return const_iterator(snippets_.end());
-  }
+  const_iterator begin() const { return const_iterator(snippets_.begin()); }
+  const_iterator end() const { return const_iterator(snippets_.end()); }
 
  private:
   friend class NTPSnippetsServiceTest;
 
   void OnSuggestionsChanged(const suggestions::SuggestionsProfile& suggestions);
   void OnSnippetsDownloaded(const std::string& snippets_json);
 
   void OnJsonParsed(const std::string& snippets_json,
                     scoped_ptr<base::Value> parsed);
   void OnJsonError(const std::string& snippets_json, const std::string& error);
@@ skipping 17 matching lines @@
   void StoreDiscardedSnippetsToPrefs();
 
   bool HasDiscardedSnippet(const GURL& url) const;
 
   void RemoveExpiredSnippets();
 
   PrefService* pref_service_;
 
   suggestions::SuggestionsService* suggestions_service_;
 
-  // True if the suggestions are loaded.
-  bool loaded_;
-
   // 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_;
 
   // 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_;
 
@@ skipping 25 matching lines @@
 
   const ParseJSONCallback parse_json_callback_;
 
   base::WeakPtrFactory<NTPSnippetsService> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(NTPSnippetsService);
 };
 
 class NTPSnippetsServiceObserver {
  public:
-  // Send everytime the service loads a new set of data.
+  // Sent every time the service loads a new set of data.
   virtual void NTPSnippetsServiceLoaded(NTPSnippetsService* service) = 0;
-  // Send when the service is shutting down.
+  // Sent when the service is shutting down.
   virtual void NTPSnippetsServiceShutdown(NTPSnippetsService* service) = 0;
 
  protected:
   virtual ~NTPSnippetsServiceObserver() {}
 };
 
 }  // namespace ntp_snippets
 
 #endif  // COMPONENTS_NTP_SNIPPETS_NTP_SNIPPETS_SERVICE_H_