Getting the personalization info in chrome://snippets-internals correct.

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>
 
@@ skipping 53 matching lines @@
       ntp_snippets_service_(nullptr) {}
 
 SnippetsInternalsMessageHandler::~SnippetsInternalsMessageHandler() {}
 
 void SnippetsInternalsMessageHandler::NTPSnippetsServiceShutdown() {}
 
 void SnippetsInternalsMessageHandler::NTPSnippetsServiceLoaded() {
   if (!dom_loaded_) return;
 
   SendSnippets();
-  SendDiscardedSnippets();
 
   web_ui()->CallJavascriptFunction(
       "chrome.SnippetsInternals.receiveJson",
-      base::StringValue(ntp_snippets_service_->last_json()));
+      base::StringValue(
+          ntp_snippets_service_->snippets_fetcher()->last_json()));
 }
 
 void SnippetsInternalsMessageHandler::NTPSnippetsServiceCleared() {}
 
 void SnippetsInternalsMessageHandler::RegisterMessages() {
   // additional initialization (web_ui() does not work from the constructor)
   ntp_snippets_service_ = NTPSnippetsServiceFactory::GetInstance()->
       GetForProfile(Profile::FromWebUI(web_ui()));
   observer_.Add(ntp_snippets_service_);
 
@@ skipping 70 matching lines @@
 
   ntp_snippets_service_->FetchSnippetsFromHosts(hosts);
 }
 
 void SnippetsInternalsMessageHandler::SendInitialData() {
   SendHosts();
 
   SendBoolean("flag-snippets", base::FeatureList::IsEnabled(
                                    chrome::android::kNTPSnippetsFeature));
 
-  bool restricted = !base::CommandLine::ForCurrentProcess()->HasSwitch(
-      ntp_snippets::switches::kDontRestrict);
-  SendBoolean("switch-restrict-to-hosts", restricted);
-  const std::string help(restricted ? "(specify at least one host)" :
-      "(unrestricted if no host is given)");
-  SendString("hosts-help", help);
+  web_ui()->CallJavascriptFunction(
+      "chrome.SnippetsInternals.setHostRestricted",
+      base::FundamentalValue(
+          ntp_snippets_service_->snippets_fetcher()->UsesHostRestrictions()));
+
+  switch (ntp_snippets_service_->snippets_fetcher()->personalization()) {
+    case ntp_snippets::NTPSnippetsFetcher::Personalization::kPersonal:
+      SendString("switch-personalized", "Only personalized");
+      break;
+    case ntp_snippets::NTPSnippetsFetcher::Personalization::kBoth:
+      SendString("switch-personalized",
+                 "Both personalized and non-personalized");
+      break;
+    case ntp_snippets::NTPSnippetsFetcher::Personalization::kNonPersonal:
+      SendString("switch-personalized", "Only non-personalized");
+      break;
+  }
 
   SendSnippets();
   SendDiscardedSnippets();
 }
 
 void SnippetsInternalsMessageHandler::SendSnippets() {
   std::unique_ptr<base::ListValue> snippets_list(new base::ListValue);
 
   int index = 0;
   for (const std::unique_ptr<ntp_snippets::NTPSnippet>& snippet :
        ntp_snippets_service_->snippets())
     snippets_list->Append(PrepareSnippet(*snippet, index++, false));
 
   base::DictionaryValue result;
   result.Set("list", std::move(snippets_list));
   web_ui()->CallJavascriptFunction("chrome.SnippetsInternals.receiveSnippets",
                                    result);
 
-  const std::string& status = ntp_snippets_service_->last_status();
+  const std::string& status =
+      ntp_snippets_service_->snippets_fetcher()->last_status();
   if (!status.empty())
     SendString("hosts-status", "Finished: " + status);
 }
 
 void SnippetsInternalsMessageHandler::SendDiscardedSnippets() {
   std::unique_ptr<base::ListValue> snippets_list(new base::ListValue);
 
   int index = 0;
   for (const auto& snippet : ntp_snippets_service_->discarded_snippets())
     snippets_list->Append(PrepareSnippet(*snippet, index++, true));
@@ skipping 34 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()->CallJavascriptFunction("chrome.SnippetsInternals.receiveProperty",
                                    string_name, string_value);
 }