Add ContentSuggestionsCategoryFactory; Store categories as ints

chrome/browser/android/ntp/ntp_snippets_bridge.cc

 // 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.
 
 #include "chrome/browser/android/ntp/ntp_snippets_bridge.h"
 
 #include <jni.h>
 
 #include "base/android/callback_android.h"
 #include "base/android/jni_android.h"
@@ skipping 16 matching lines @@
 using base::android::AttachCurrentThread;
 using base::android::ConvertJavaStringToUTF8;
 using base::android::JavaParamRef;
 using base::android::ToJavaArrayOfStrings;
 using base::android::ToJavaLongArray;
 using base::android::ToJavaFloatArray;
 using base::android::ScopedJavaGlobalRef;
 using base::android::ScopedJavaLocalRef;
 using ntp_snippets::ContentSuggestionsCategory;
 using ntp_snippets::ContentSuggestionsCategoryStatus;
+using ntp_snippets::KnownSuggestionsCategories;
 
 namespace {
 
 void SnippetVisitedHistoryRequestCallback(
       base::android::ScopedJavaGlobalRef<jobject> callback,
       bool success,
       const history::URLRow& row,
       const history::VisitVector& visitVector) {
   bool visited = success && row.visit_count() != 0;
   base::android::RunCallbackAndroid(callback, visited);
@@ skipping 27 matching lines @@
 NTPSnippetsBridge::NTPSnippetsBridge(JNIEnv* env,
                                      const JavaParamRef<jobject>& j_profile)
     : content_suggestions_service_observer_(this), weak_ptr_factory_(this) {
   Profile* profile = ProfileAndroid::FromProfileAndroid(j_profile);
   content_suggestions_service_ =
       ContentSuggestionsServiceFactory::GetForProfile(profile);
   history_service_ =
       HistoryServiceFactory::GetForProfile(profile,
                                            ServiceAccessType::EXPLICIT_ACCESS);
   content_suggestions_service_observer_.Add(content_suggestions_service_);
+  category_factory_ = content_suggestions_service_->category_factory();
 }
 
 void NTPSnippetsBridge::Destroy(JNIEnv* env, const JavaParamRef<jobject>& obj) {
   delete this;
 }
 
 void NTPSnippetsBridge::SetObserver(JNIEnv* env,
                                     const JavaParamRef<jobject>& obj,
                                     const JavaParamRef<jobject>& j_observer) {
   observer_.Reset(env, j_observer);
@@ skipping 27 matching lines @@
   history_service_->QueryURL(
       GURL(ConvertJavaStringToUTF8(env, jurl)),
       false,
       base::Bind(&SnippetVisitedHistoryRequestCallback, callback),
       &tracker_);
 }
 
 int NTPSnippetsBridge::GetCategoryStatus(JNIEnv* env,
                                          const JavaParamRef<jobject>& obj) {
   return static_cast<int>(content_suggestions_service_->GetCategoryStatus(
-      ContentSuggestionsCategory::ARTICLES));
+      category_factory_->FromKnownCategory(
+          KnownSuggestionsCategories::ARTICLES)));
 }
 
 NTPSnippetsBridge::~NTPSnippetsBridge() {}
 
 void NTPSnippetsBridge::OnNewSuggestions() {
   if (observer_.is_null())
     return;
 
   std::vector<std::string> ids;
   std::vector<std::string> titles;
@@ skipping 41 matching lines @@
       ToJavaArrayOfStrings(env, amp_urls).obj(),
       ToJavaArrayOfStrings(env, snippets).obj(),
       ToJavaLongArray(env, timestamps).obj(),
       ToJavaArrayOfStrings(env, publishers).obj(),
       ToJavaFloatArray(env, scores).obj());
 }
 
 void NTPSnippetsBridge::OnCategoryStatusChanged(
     ContentSuggestionsCategory category,
     ContentSuggestionsCategoryStatus new_status) {
-  if (category != ContentSuggestionsCategory::ARTICLES)
+  if (category != KnownSuggestionsCategories::ARTICLES)
     return;
 
   JNIEnv* env = base::android::AttachCurrentThread();
   Java_SnippetsBridge_onCategoryStatusChanged(env, observer_.obj(),
                                               static_cast<int>(new_status));
 }
 
 void NTPSnippetsBridge::ContentSuggestionsServiceShutdown() {
   observer_.Reset();
   content_suggestions_service_observer_.Remove(content_suggestions_service_);
 }
 
 void NTPSnippetsBridge::OnImageFetched(ScopedJavaGlobalRef<jobject> callback,
                                        const std::string& snippet_id,
                                        const gfx::Image& image) {
   ScopedJavaLocalRef<jobject> j_bitmap;
   if (!image.IsEmpty())
     j_bitmap = gfx::ConvertToJavaBitmap(image.ToSkBitmap());
 
   base::android::RunCallbackAndroid(callback, j_bitmap);
 }
 
 // static
 bool NTPSnippetsBridge::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }