Remove legacy popular sites cache cleaning

components/ntp_tiles/popular_sites_impl_unittest.cc

 // Copyright 2016 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 "components/ntp_tiles/popular_sites_impl.h"
 
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/files/important_file_writer.h"

[mastiz, 2017/06/21 04:44:22]

Same for the two above.

[fhorschig, 2017/06/23 18:11:23]

Gone.

-#include "base/files/scoped_temp_dir.h"
 #include "base/json/json_writer.h"
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/optional.h"
 #include "base/run_loop.h"
 #include "base/test/scoped_feature_list.h"
-#include "base/test/sequenced_worker_pool_owner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/values.h"
 #include "components/ntp_tiles/constants.h"
 #include "components/ntp_tiles/json_unsafe_parser.h"
 #include "components/ntp_tiles/pref_names.h"
 #include "components/ntp_tiles/switches.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/sync_preferences/testing_pref_service_syncable.h"
 #include "net/http/http_status_code.h"
 #include "net/url_request/test_url_fetcher_factory.h"
@@ skipping 44 matching lines @@
         kYouTube{
             {kTitle, "YouTube"},
             {kUrl, "https://m.youtube.com/"},
             {kLargeIconUrl, "https://s.ytimg.com/apple-touch-icon.png"},
         },
         kChromium{
             {kTitle, "The Chromium Project"},
             {kUrl, "https://www.chromium.org/"},
             {kFaviconUrl, "https://www.chromium.org/favicon.ico"},
         },
-        worker_pool_owner_(2, "PopularSitesTest."),
         prefs_(new sync_preferences::TestingPrefServiceSyncable()),
         url_fetcher_factory_(nullptr) {
     base::CommandLine::ForCurrentProcess()->AppendSwitch(
         switches::kEnableNTPPopularSites);
     PopularSitesImpl::RegisterProfilePrefs(prefs_->registry());
-    CHECK(scoped_cache_dir_.CreateUniqueTempDir());
-    cache_dir_ = scoped_cache_dir_.GetPath();
   }
 
   void SetCountryAndVersion(const std::string& country,
                             const std::string& version) {
     prefs_->SetString(prefs::kPopularSitesOverrideCountry, country);
     prefs_->SetString(prefs::kPopularSitesOverrideVersion, version);
   }
 
   void RespondWithJSON(const std::string& url,
                        const TestPopularSiteVector& sites) {
@@ skipping 48 matching lines @@
                                 &save_success, &loop))) {
       loop.Run();
     }
     *sites = popular_sites->sites();
     return save_success;
   }
 
   std::unique_ptr<PopularSites> CreatePopularSites(
       net::URLRequestContextGetter* context) {
     return base::MakeUnique<PopularSitesImpl>(
-        worker_pool_owner_.pool().get(), prefs_.get(),
+        prefs_.get(),
         /*template_url_service=*/nullptr,
-        /*variations_service=*/nullptr, context, cache_dir_,
+        /*variations_service=*/nullptr, context,
         base::Bind(JsonUnsafeParser::Parse));
   }
 
   const TestPopularSite kWikipedia;
   const TestPopularSite kYouTube;
   const TestPopularSite kChromium;
 
   base::MessageLoopForUI ui_loop_;
-  base::SequencedWorkerPoolOwner worker_pool_owner_;
-  base::ScopedTempDir scoped_cache_dir_;
-  base::FilePath cache_dir_;
   std::unique_ptr<sync_preferences::TestingPrefServiceSyncable> prefs_;
   net::FakeURLFetcherFactory url_fetcher_factory_;
 };
 
 TEST_F(PopularSitesTest, ContainsDefaultTilesRightAfterConstruction) {
   scoped_refptr<net::TestURLRequestContextGetter> url_request_context(
       new net::TestURLRequestContextGetter(
           base::ThreadTaskRunnerHandle::Get()));
 
   auto popular_sites = CreatePopularSites(url_request_context.get());
@@ skipping 114 matching lines @@
   EXPECT_THAT(popular_sites->sites().size(),
               Eq(GetNumberOfDefaultPopularSitesForPlatform()));
 
   loop.Run();  // Wait for the fetch to finish and the callback to return.
 
   EXPECT_TRUE(save_success.value());
   // The 1 fetched site should replace the default sites.
   EXPECT_THAT(popular_sites->sites().size(), Eq(1ul));
 }
 
-TEST_F(PopularSitesTest, ClearsCacheFileFromOldVersions) {
-  SetCountryAndVersion("ZZ", "9");
-  RespondWithJSON(
-      "https://www.gstatic.com/chrome/ntp/suggested_sites_ZZ_9.json",
-      {kWikipedia});
-
-  PopularSites::SitesVector sites;
-  const base::FilePath old_cache_path =
-      cache_dir_.AppendASCII("suggested_sites.json");
-  CHECK(base::ImportantFileWriter::WriteFileAtomically(old_cache_path,
-                                                       "Old cache"));
-  FetchPopularSites(/*force_download=*/false, &sites);
-  worker_pool_owner_.pool()->FlushForTesting();
-  EXPECT_FALSE(base::PathExists(old_cache_path));
-}
-
 TEST_F(PopularSitesTest, UsesCachedJson) {
   SetCountryAndVersion("ZZ", "9");
   RespondWithJSON(
       "https://www.gstatic.com/chrome/ntp/suggested_sites_ZZ_9.json",
       {kWikipedia});
 
   // First request succeeds and gets cached.
   PopularSites::SitesVector sites;
   ASSERT_THAT(FetchPopularSites(/*force_download=*/false, &sites),
               Eq(base::Optional<bool>(true)));
@@ skipping 129 matching lines @@
 
   PopularSites::SitesVector sites;
   EXPECT_THAT(FetchPopularSites(/*force_download=*/false, &sites),
               Eq(base::Optional<bool>(true)));
 
   EXPECT_THAT(sites.size(), Eq(1u));
 }
 
 }  // namespace
 }  // namespace ntp_tiles