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"
 #include "base/files/file_util.h"
 #include "base/memory/ref_counted.h"
+#include "base/path_service.h"
 #include "base/task_runner_util.h"
 #include "base/values.h"
 #include "chrome/browser/android/ntp/popular_sites.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
+#include "chrome/common/chrome_paths.h"
 #include "components/ntp_tiles/pref_names.h"
 #include "components/prefs/pref_service.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;
 }
 
+base::FilePath GetPopularSitesDirectory() {

[Marc Treib, 2016/05/10 08:32:43]

Can we move this to a common place somewhere? Maybe a new
popular_sites_util.h/cc in c/b/android/ntp/ if there isn't a place for it
already.

+  base::FilePath dir;
+  PathService::Get(chrome::DIR_USER_DATA, &dir);
+  return dir;  // empty if PathService::Get() failed.
+}
+
 }  // namespace
 
 PopularSitesInternalsMessageHandler::PopularSitesInternalsMessageHandler()
     : weak_ptr_factory_(this) {}
 
 PopularSitesInternalsMessageHandler::~PopularSitesInternalsMessageHandler() {}
 
 void PopularSitesInternalsMessageHandler::RegisterMessages() {
   web_ui()->RegisterMessageCallback("registerForEvents",
       base::Bind(&PopularSitesInternalsMessageHandler::HandleRegisterForEvents,
@@ skipping 10 matching lines @@
 }
 
 void PopularSitesInternalsMessageHandler::HandleRegisterForEvents(
     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(),
-      std::string(), std::string(), false,
+      profile->GetPrefs(), TemplateURLServiceFactory::GetForProfile(profile),
+      g_browser_process->variations_service(), profile->GetRequestContext(),
+      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 =
       base::Bind(&PopularSitesInternalsMessageHandler::OnPopularSitesAvailable,
@@ skipping 12 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(),
+        profile->GetPrefs(), TemplateURLServiceFactory::GetForProfile(profile),
+        profile->GetRequestContext(), GetPopularSitesDirectory(),
         url_formatter::FixupURL(url, std::string()), callback));
     return;
   }
 
   popular_sites_.reset(new PopularSites(
-      profile->GetPrefs(),
-      TemplateURLServiceFactory::GetForProfile(profile),
-      g_browser_process->variations_service(),
-      profile->GetRequestContext(),
-      std::string(), std::string(), true, callback));
+      profile->GetPrefs(), TemplateURLServiceFactory::GetForProfile(profile),
+      g_browser_process->variations_service(), profile->GetRequestContext(),
+      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()
           ->GetTaskRunnerWithShutdownBehavior(
@@ skipping 42 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();
 }