Change NTPSnippetsBridge to read from ContentSuggestionsService

chrome/browser/android/ntp/ntp_snippets_bridge.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 CHROME_BROWSER_ANDROID_NTP_NTP_SNIPPETS_BRIDGE_H_
 #define CHROME_BROWSER_ANDROID_NTP_NTP_SNIPPETS_BRIDGE_H_
 
 #include <jni.h>
 
 #include "base/android/scoped_java_ref.h"
 #include "base/memory/weak_ptr.h"
 #include "base/scoped_observer.h"
 #include "base/task/cancelable_task_tracker.h"
 #include "components/history/core/browser/history_service.h"
+#include "components/ntp_snippets/content_suggestions_category.h"
+#include "components/ntp_snippets/content_suggestions_category_status.h"
+#include "components/ntp_snippets/content_suggestions_service.h"
 #include "components/ntp_snippets/ntp_snippets_service.h"
 
 namespace gfx {
 class Image;
 }
 
 // The C++ counterpart to SnippetsBridge.java. Enables Java code to access
 // the list of snippets to show on the NTP
-class NTPSnippetsBridge : public ntp_snippets::NTPSnippetsServiceObserver {
+class NTPSnippetsBridge
+    : public ntp_snippets::ContentSuggestionsService::Observer {
  public:
   NTPSnippetsBridge(JNIEnv* env,
                     const base::android::JavaParamRef<jobject>& j_profile);
   void Destroy(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj);
 
   void SetObserver(JNIEnv* env,
                    const base::android::JavaParamRef<jobject>& obj,
                    const base::android::JavaParamRef<jobject>& j_observer);
 
   void FetchImage(JNIEnv* env,
                   const base::android::JavaParamRef<jobject>& obj,
                   const base::android::JavaParamRef<jstring>& snippet_id,

[Marc Treib, 2016/07/19 16:21:19]

suggestion_id, also in the other methods

[Philipp Keck, 2016/07/19 16:47:35]

Yeah, though the entire class would need to be refactored. It now transports
ContentSuggestions, but is still called SnippetsBridge. And DiscardSnippet
should be DiscardSuggestion, etc.

My plan is to build a second "SuggestionBridge" with all the new methods next to
this one (working with Michael to make this an appropriate interface for the
refactored UI) and then delete this class completely. Otherwise I'd make a
separate renaming CL that renames everything: class, methods, parameters.

(I do see the point that "suggestion_id" would make it more explicit that this
is now the combined/unique ID. But consequently I also would have to rename that
in all the UI code. Since the idea has been and will be that the UI does not
understand this ID, it shouldn't really matter; the UI can't accidentally pass
in the wrong ID here, because it doesn't have it.)

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

Acknowledged.

                   const base::android::JavaParamRef<jobject>& j_callback);
 
   // Discards the snippet with the given ID.
   void DiscardSnippet(JNIEnv* env,
                       const base::android::JavaParamRef<jobject>& obj,
                       const base::android::JavaParamRef<jstring>& snippet_id);
 
   // Checks if the URL has been visited.
   void SnippetVisited(JNIEnv* env,
                       const base::android::JavaParamRef<jobject>& obj,
                       const base::android::JavaParamRef<jobject>& callback,
                       const base::android::JavaParamRef<jstring>& jurl);
 
-  // Returns a reason why the snippet service is disabled, or 0 if it isn't.
-  // See NTPSnippetsService::DisabledReason for more info.
-  int GetDisabledReason(JNIEnv* env,
+  // Returns the status of the ARTICLES category.
+  // See ContentSuggestionsCategoryStatus for more info.
+  int GetCategoryStatus(JNIEnv* env,
                         const base::android::JavaParamRef<jobject>& obj);
 
   static bool Register(JNIEnv* env);
 
  private:
   ~NTPSnippetsBridge() override;
 
-  // NTPSnippetsServiceObserver overrides
-  void NTPSnippetsServiceLoaded() override;
-  void NTPSnippetsServiceShutdown() override;
-  void NTPSnippetsServiceDisabledReasonChanged(
-      ntp_snippets::DisabledReason disabled_reason) override;
+  // ContentSuggestionsService::Observer overrides
+  void OnNewSuggestions() override;
+  void OnCategoryStatusChanged(
+      ntp_snippets::ContentSuggestionsCategory category,
+      ntp_snippets::ContentSuggestionsCategoryStatus new_status) override;
+  void ContentSuggestionsServiceShutdown() override;
 
   void OnImageFetched(base::android::ScopedJavaGlobalRef<jobject> callback,
                       const std::string& snippet_id,
                       const gfx::Image& image);
 
-  ntp_snippets::NTPSnippetsService* ntp_snippets_service_;
+  ntp_snippets::ContentSuggestionsService* content_suggestions_service_;
   history::HistoryService* history_service_;
   base::CancelableTaskTracker tracker_;
 
   // Used to notify the Java side when new snippets have been fetched.
   base::android::ScopedJavaGlobalRef<jobject> observer_;
-  ScopedObserver<ntp_snippets::NTPSnippetsService,
-                 ntp_snippets::NTPSnippetsServiceObserver>
-      snippet_service_observer_;
+  ScopedObserver<ntp_snippets::ContentSuggestionsService,
+                 ntp_snippets::ContentSuggestionsService::Observer>
+      content_suggestions_service_observer_;
 
   base::WeakPtrFactory<NTPSnippetsBridge> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(NTPSnippetsBridge);
 };
 
 #endif  // CHROME_BROWSER_ANDROID_NTP_NTP_SNIPPETS_BRIDGE_H_