| Index: components/ntp_tiles/popular_sites_impl.cc
|
| diff --git a/components/ntp_tiles/popular_sites_impl.cc b/components/ntp_tiles/popular_sites_impl.cc
|
| index eb52b3925c0aa182a4ec0f3f06881460b7cdd1a0..ed4e99ba9919e7211fa563c52bac5ac34e9429ca 100644
|
| --- a/components/ntp_tiles/popular_sites_impl.cc
|
| +++ b/components/ntp_tiles/popular_sites_impl.cc
|
| @@ -10,12 +10,8 @@
|
| #include "base/bind.h"
|
| #include "base/command_line.h"
|
| #include "base/feature_list.h"
|
| -#include "base/files/file_path.h"
|
| -#include "base/files/file_util.h"
|
| -#include "base/path_service.h"
|
| #include "base/strings/string_util.h"
|
| #include "base/strings/stringprintf.h"
|
| -#include "base/threading/sequenced_worker_pool.h"
|
| #include "base/time/time.h"
|
| #include "base/values.h"
|
| #include "components/data_use_measurement/core/data_use_user_data.h"
|
| @@ -62,10 +58,6 @@ const char kPopularSitesLastDownloadPref[] = "popular_sites_last_download";
|
| const char kPopularSitesURLPref[] = "popular_sites_url";
|
| const char kPopularSitesJsonPref[] = "suggested_sites_json";
|
|
|
| -// TODO(crbug.com/683890): This refers to a local cache stored by older
|
| -// versions of Chrome, no longer used. Remove after M61.
|
| -const char kPopularSitesLocalFilenameToCleanup[] = "suggested_sites.json";
|
| -
|
| GURL GetPopularSitesURL(const std::string& directory,
|
| const std::string& country,
|
| const std::string& version) {
|
| @@ -197,32 +189,19 @@ PopularSites::Site::Site(const Site& other) = default;
|
| PopularSites::Site::~Site() {}
|
|
|
| PopularSitesImpl::PopularSitesImpl(
|
| - const scoped_refptr<base::SequencedWorkerPool>& blocking_pool,
|
| PrefService* prefs,
|
| const TemplateURLService* template_url_service,
|
| VariationsService* variations_service,
|
| net::URLRequestContextGetter* download_context,
|
| - const base::FilePath& directory,
|
| ParseJSONCallback parse_json)
|
| - : blocking_runner_(blocking_pool->GetTaskRunnerWithShutdownBehavior(
|
| - base::SequencedWorkerPool::CONTINUE_ON_SHUTDOWN)),
|
| - prefs_(prefs),
|
| + : prefs_(prefs),
|
| template_url_service_(template_url_service),
|
| variations_(variations_service),
|
| download_context_(download_context),
|
| parse_json_(std::move(parse_json)),
|
| is_fallback_(false),
|
| sites_(ParseSiteList(*prefs->GetList(kPopularSitesJsonPref))),
|
| - weak_ptr_factory_(this) {
|
| - // If valid path provided, remove local files created by older versions.
|
| - if (!directory.empty() && blocking_runner_) {
|
| - blocking_runner_->PostTask(
|
| - FROM_HERE,
|
| - base::Bind(base::IgnoreResult(&base::DeleteFile),
|
| - directory.AppendASCII(kPopularSitesLocalFilenameToCleanup),
|
| - /*recursive=*/false));
|
| - }
|
| -}
|
| + weak_ptr_factory_(this) {}
|
|
|
| PopularSitesImpl::~PopularSitesImpl() {}
|
|
|
|
|