Measure usage metrics to prepare for adaptive fetching rates in M55

components/ntp_snippets/content_suggestions_service.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_SERVICE_H_
 #define COMPONENTS_NTP_SNIPPETS_CONTENT_SUGGESTIONS_SERVICE_H_
 
 #include <map>
 #include <memory>
+#include <set>

[Marc Treib, 2016/09/07 13:23:48]

Is this required?

[jkrcal, 2016/09/07 14:19:07]

Not for the changes I did. Still, std::set is used in this file.

 #include <string>
 #include <vector>
 
 #include "base/callback_forward.h"
 #include "base/observer_list.h"
 #include "base/optional.h"
 #include "base/scoped_observer.h"
 #include "base/time/time.h"
 #include "components/history/core/browser/history_service.h"
 #include "components/history/core/browser/history_service_observer.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "components/ntp_snippets/category_factory.h"
 #include "components/ntp_snippets/category_status.h"
 #include "components/ntp_snippets/content_suggestions_provider.h"
+#include "components/ntp_snippets/user_classifier.h"
 
 namespace gfx {
 class Image;
 }
 
 namespace ntp_snippets {
 
 class NTPSnippetsService;
 
 // Retrieves suggestions from a number of ContentSuggestionsProviders and serves
@@ skipping 40 matching lines @@
    protected:
     virtual ~Observer() {}
   };
 
   enum State {
     ENABLED,
     DISABLED,
   };
 
   ContentSuggestionsService(State state,
-                            history::HistoryService* history_service);
+                            history::HistoryService* history_service,
+                            PrefService* pref_service);

[Marc Treib, 2016/09/07 13:23:48]

Forward-declare PrefService

[jkrcal, 2016/09/07 14:19:07]

Done.

   ~ContentSuggestionsService() override;
 
   // Inherited from KeyedService.
   void Shutdown() override;
 
   State state() { return state_; }
 
   // Gets all categories for which a provider is registered. The categories
   // may or may not be available, see |GetCategoryStatus()|.
   const std::vector<Category>& GetCategories() const { return categories_; }
@@ skipping 70 matching lines @@
 
   CategoryFactory* category_factory() { return &category_factory_; }
 
   // The reference to the NTPSnippetsService provider should only be set by the
   // factory and only be used for scheduling, periodic fetching and debugging.
   NTPSnippetsService* ntp_snippets_service() { return ntp_snippets_service_; }
   void set_ntp_snippets_service(NTPSnippetsService* ntp_snippets_service) {
     ntp_snippets_service_ = ntp_snippets_service;
   }
 
+  UserClassifier* user_classifier() { return &user_classifier_;}
+
  private:
   friend class ContentSuggestionsServiceTest;
 
   // Implementation of ContentSuggestionsProvider::Observer.
   void OnNewSuggestions(ContentSuggestionsProvider* provider,
                         Category category,
                         std::vector<ContentSuggestion> suggestions) override;
   void OnCategoryStatusChanged(ContentSuggestionsProvider* provider,
                                Category category,
                                CategoryStatus new_status) override;
@@ skipping 67 matching lines @@
 
   base::ObserverList<Observer> observers_;
 
   const std::vector<ContentSuggestion> no_suggestions_;
 
   // Keep a direct reference to this special provider to redirect scheduling,
   // background fetching and debugging calls to it. If the NTPSnippetsService is
   // loaded, it is also present in |providers_|, otherwise this is a nullptr.
   NTPSnippetsService* ntp_snippets_service_;
 
+  UserClassifier user_classifier_;
+
   DISALLOW_COPY_AND_ASSIGN(ContentSuggestionsService);
 };
 
 }  // namespace ntp_snippets
 
 #endif  // COMPONENTS_NTP_SNIPPETS_CONTENT_SUGGESTIONS_SERVICE_H_