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()));
 }
 
 void SnippetsInternalsMessageHandler::RegisterMessages() {
   // additional initialization (web_ui() does not work from the constructor)
   ntp_snippets_service_ = NTPSnippetsServiceFactory::GetInstance()->
       GetForProfile(Profile::FromWebUI(web_ui()));
@@ skipping 72 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);
+  bool host_restricted = ntp_snippets_service_->UseHostRestriction();
+  SendBoolean("switch-restrict-to-hosts", host_restricted);
+  if (!host_restricted) {
+    web_ui()->CallJavascriptFunction(
+        "chrome.SnippetsInternals.hideHostRestricts");

[Bernhard Bauer, 2016/05/18 10:08:03]

If you add a dedicated method here anyway, you could pass |host_restricted| in
as a parameter and update switch-restrict-to-hosts from there, so you only have
a single call here.

[jkrcal, 2016/05/19 07:30:28]

Done.

+  }
+
+  ntp_snippets::NTPSnippetsFetcher::Personalization personal =
+      ntp_snippets_service_->personalization();
+  if (personal == ntp_snippets::NTPSnippetsFetcher::Personalization::kPersonal)
+    SendString("switch-personalized", "Only personalized");

[Bernhard Bauer, 2016/05/18 10:08:03]

Use a switch statement so the compiler can check you've covered all the cases
(this implies explicitly writing all of values instead of using a default:
fallback).

[jkrcal, 2016/05/19 07:30:28]

Done.

+  else if (personal == ntp_snippets::NTPSnippetsFetcher::Personalization::kBoth)
+    SendString("switch-personalized", "Both personalized and non-personalized");
+  else
+    SendString("switch-personalized", "Only non-personalized");
 
   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 :
@@ skipping 53 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);
 }