Remove Profile dependency from PopularSites.

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 "chrome/browser/search_engines/template_url_service_factory.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();
@@ skipping 21 matching lines @@
       base::Bind(&PopularSitesInternalsMessageHandler::HandleViewJson,
                  base::Unretained(this)));
 }
 
 void PopularSitesInternalsMessageHandler::HandleRegisterForEvents(
     const base::ListValue* args) {
   DCHECK(args->empty());
 
   std::string country;
   std::string version;
+  Profile* profile = Profile::FromWebUI(web_ui());
   popular_sites_.reset(new PopularSites(
-      Profile::FromWebUI(web_ui()), country, version, false,
+      profile->GetPrefs(),
+      TemplateURLServiceFactory::GetForProfile(profile),
+      profile->GetRequestContext(),
+      country, version, false,
       base::Bind(&PopularSitesInternalsMessageHandler::OnPopularSitesAvailable,
                  base::Unretained(this), false)));
 }
 
 void PopularSitesInternalsMessageHandler::HandleDownload(
     const base::ListValue* args) {
   DCHECK_EQ(3u, args->GetSize());
+  Profile* profile = Profile::FromWebUI(web_ui());
   auto callback =
       base::Bind(&PopularSitesInternalsMessageHandler::OnPopularSitesAvailable,
                  base::Unretained(this), true);
 
   std::string url;
   args->GetString(0, &url);
   if (!url.empty()) {
     popular_sites_.reset(new PopularSites(
-        Profile::FromWebUI(web_ui()),
+        profile->GetPrefs(),
+        TemplateURLServiceFactory::GetForProfile(profile),
+        profile->GetRequestContext(),
         url_formatter::FixupURL(url, std::string()), callback));
     return;
   }
   std::string country;
   args->GetString(1, &country);
   std::string version;
   args->GetString(2, &version);
-  popular_sites_.reset(new PopularSites(Profile::FromWebUI(web_ui()), country,
-                                        version, true, callback));
+  popular_sites_.reset(new PopularSites(
+      profile->GetPrefs(),
+      TemplateURLServiceFactory::GetForProfile(profile),
+      profile->GetRequestContext(),
+      country, version, true, callback));
 }
 
 void PopularSitesInternalsMessageHandler::HandleViewJson(
     const base::ListValue* args) {
   DCHECK_EQ(0u, args->GetSize());
 
   const base::FilePath& path = popular_sites_->local_path();
   base::PostTaskAndReplyWithResult(
       content::BrowserThread::GetBlockingPool()
           ->GetTaskRunnerWithShutdownBehavior(
@@ skipping 31 matching lines @@
   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();
 }