Remove PopularSites' dependencies on //chrome/....

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"
@@ skipping 46 matching lines @@
     const base::ListValue* args) {
   DCHECK(args->empty());
 
   SendOverrides();
 
   Profile* profile = Profile::FromWebUI(web_ui());
   popular_sites_.reset(new PopularSites(
       profile->GetPrefs(),
       TemplateURLServiceFactory::GetForProfile(profile),
       g_browser_process->variations_service(),
-      profile->GetRequestContext(),
+      profile->GetRequestContext(), ntp_tiles::GetPopularSitesDirectory(),
       std::string(), std::string(), false,
       base::Bind(&PopularSitesInternalsMessageHandler::OnPopularSitesAvailable,
                  base::Unretained(this), false)));
 }
 
 void PopularSitesInternalsMessageHandler::HandleUpdate(
     const base::ListValue* args) {
   DCHECK_EQ(3u, args->GetSize());
   Profile* profile = Profile::FromWebUI(web_ui());
   auto callback =
@@ skipping 13 matching lines @@
   args->GetString(2, &version);
   if (version.empty())
     prefs->ClearPref(ntp_tiles::prefs::kPopularSitesOverrideVersion);
   else
     prefs->SetString(ntp_tiles::prefs::kPopularSitesOverrideVersion, version);
 
   std::string url;
   args->GetString(0, &url);
   if (!url.empty()) {
     popular_sites_.reset(new PopularSites(
-        profile->GetPrefs(),
-        TemplateURLServiceFactory::GetForProfile(profile),
-        profile->GetRequestContext(),
+        prefs, TemplateURLServiceFactory::GetForProfile(profile),
+        profile->GetRequestContext(), ntp_tiles::GetPopularSitesDirectory(),
         url_formatter::FixupURL(url, std::string()), callback));
     return;
   }
 
   popular_sites_.reset(new PopularSites(
-      profile->GetPrefs(),
-      TemplateURLServiceFactory::GetForProfile(profile),
+      prefs, TemplateURLServiceFactory::GetForProfile(profile),
       g_browser_process->variations_service(),
-      profile->GetRequestContext(),
+      profile->GetRequestContext(), ntp_tiles::GetPopularSitesDirectory(),
       std::string(), std::string(), 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()
@@ skipping 43 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();
 }