Combine all suggestions factories into ContentSuggestionsServiceFactory

chrome/browser/ui/webui/snippets_internals_message_handler.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/ui/webui/snippets_internals_message_handler.h"
 
 #include <memory>
 #include <set>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/feature_list.h"
 #include "base/i18n/time_formatting.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/values.h"
 #include "chrome/browser/android/chrome_feature_list.h"
 #include "chrome/browser/ntp_snippets/content_suggestions_service_factory.h"
-#include "chrome/browser/ntp_snippets/ntp_snippets_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "components/ntp_snippets/ntp_snippet.h"
 #include "components/ntp_snippets/switches.h"
 #include "content/public/browser/web_ui.h"
 
 using ntp_snippets::ContentSuggestion;
 using ntp_snippets::Category;
 using ntp_snippets::CategoryStatus;
 using ntp_snippets::KnownCategories;
 
@@ skipping 70 matching lines @@
       return "SIGNED_OUT";
     case CategoryStatus::LOADING_ERROR:
       return "LOADING_ERROR";
   }
   return std::string();
 }
 
 } // namespace
 
 SnippetsInternalsMessageHandler::SnippetsInternalsMessageHandler()
-    : ntp_snippets_service_observer_(this),
-      content_suggestions_service_observer_(this),
+    : content_suggestions_service_observer_(this),
       dom_loaded_(false),
       ntp_snippets_service_(nullptr),
       content_suggestions_service_(nullptr) {}
 
 SnippetsInternalsMessageHandler::~SnippetsInternalsMessageHandler() {}
 
-void SnippetsInternalsMessageHandler::NTPSnippetsServiceShutdown() {}
-
-void SnippetsInternalsMessageHandler::NTPSnippetsServiceLoaded() {
-  if (!dom_loaded_) return;
-
-  SendSnippets();
-
-  web_ui()->CallJavascriptFunctionUnsafe(
-      "chrome.SnippetsInternals.receiveJson",
-      base::StringValue(
-          ntp_snippets_service_->snippets_fetcher()->last_json()));
-}
-
-void SnippetsInternalsMessageHandler::NTPSnippetsServiceDisabledReasonChanged(
-    ntp_snippets::DisabledReason disabled_reason) {}
-
 void SnippetsInternalsMessageHandler::OnNewSuggestions() {
   if (!dom_loaded_)
     return;
   SendContentSuggestions();
 }
 
 void SnippetsInternalsMessageHandler::OnCategoryStatusChanged(
     Category category,
     CategoryStatus new_status) {
   if (!dom_loaded_)
     return;
   SendContentSuggestions();
 }
 
 void SnippetsInternalsMessageHandler::ContentSuggestionsServiceShutdown() {}
 
 void SnippetsInternalsMessageHandler::RegisterMessages() {
   // additional initialization (web_ui() does not work from the constructor)
   Profile* profile = Profile::FromWebUI(web_ui());
 
-  ntp_snippets_service_ =
-      NTPSnippetsServiceFactory::GetInstance()->GetForProfile(profile);
-  ntp_snippets_service_observer_.Add(ntp_snippets_service_);
-
   content_suggestions_service_ =
       ContentSuggestionsServiceFactory::GetInstance()->GetForProfile(profile);
   content_suggestions_service_observer_.Add(content_suggestions_service_);
 
+  ntp_snippets_service_ = content_suggestions_service_->ntp_snippets_service();
+
   web_ui()->RegisterMessageCallback(
       "refreshContent",
       base::Bind(&SnippetsInternalsMessageHandler::HandleRefreshContent,
                  base::Unretained(this)));
 
   web_ui()->RegisterMessageCallback(
       "clear", base::Bind(&SnippetsInternalsMessageHandler::HandleClear,
                           base::Unretained(this)));
 
   web_ui()->RegisterMessageCallback(
@@ skipping 93 matching lines @@
       SendString("switch-personalized",
                  "Both personalized and non-personalized");
       break;
     case ntp_snippets::NTPSnippetsFetcher::Personalization::kNonPersonal:
       SendString("switch-personalized", "Only non-personalized");
       break;
   }
 
   SendString("switch-fetch-url",
              ntp_snippets_service_->snippets_fetcher()->fetch_url().spec());
+  web_ui()->CallJavascriptFunctionUnsafe(
+      "chrome.SnippetsInternals.receiveJson",
+      base::StringValue(
+          ntp_snippets_service_->snippets_fetcher()->last_json()));
 
   SendSnippets();
   SendDismissedSnippets();
   SendContentSuggestions();
 }
 
 void SnippetsInternalsMessageHandler::SendSnippets() {
   std::unique_ptr<base::ListValue> snippets_list(new base::ListValue);
 
   int index = 0;
@@ skipping 78 matching lines @@
 }
 
 void SnippetsInternalsMessageHandler::SendString(const std::string& name,
                                                  const std::string& value) {
   base::StringValue string_name(name);
   base::StringValue string_value(value);
 
   web_ui()->CallJavascriptFunctionUnsafe(
       "chrome.SnippetsInternals.receiveProperty", string_name, string_value);
 }