[NTP Popular Sites] Store country/version in prefs

chrome/browser/ui/webui/popular_sites_internals_message_handler.cc

 // Copyright 2015 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/popular_sites_internals_message_handler.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/task_runner_util.h"
 #include "base/values.h"
 #include "chrome/browser/android/ntp/popular_sites.h"
 #include "chrome/browser/profiles/profile.h"
 #include "components/url_formatter/url_fixer.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_ui.h"
 
 namespace {
 
 std::string ReadFileToString(const base::FilePath& path) {
   std::string result;
   if (!base::ReadFileToString(path, &result))
     result.clear();
   return result;
 }
-}
+
+}  // namespace
 
 PopularSitesInternalsMessageHandler::PopularSitesInternalsMessageHandler()
     : weak_ptr_factory_(this) {}
 
 PopularSitesInternalsMessageHandler::~PopularSitesInternalsMessageHandler() {}
 
 void PopularSitesInternalsMessageHandler::RegisterMessages() {
   web_ui()->RegisterMessageCallback("registerForEvents",
       base::Bind(&PopularSitesInternalsMessageHandler::HandleRegisterForEvents,
                  base::Unretained(this)));
@@ skipping 68 matching lines @@
   scoped_ptr<base::ListValue> sites_list(new base::ListValue);
   for (const PopularSites::Site& site : popular_sites_->sites()) {
     scoped_ptr<base::DictionaryValue> entry(new base::DictionaryValue);
     entry->SetString("title", site.title);
     entry->SetString("url", site.url.spec());
     sites_list->Append(std::move(entry));
   }
 
   base::DictionaryValue result;
   result.Set("sites", std::move(sites_list));
+  result.SetString("country", popular_sites_->GetCountry());
+  result.SetString("version", popular_sites_->GetVersion());
   web_ui()->CallJavascriptFunction(
       "chrome.popular_sites_internals.receiveSites", result);
 }
 
 void PopularSitesInternalsMessageHandler::SendJson(const std::string& json) {
   web_ui()->CallJavascriptFunction("chrome.popular_sites_internals.receiveJson",
                                    base::StringValue(json));
 }
 
 void PopularSitesInternalsMessageHandler::OnPopularSitesAvailable(
     bool explicit_request, bool success) {
   if (explicit_request)
     SendDownloadResult(success);
   SendSites();
 }