[Offline Pages] Removes two-step expiration related.

chrome/browser/android/offline_pages/offline_page_utils_unittest.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/android/offline_pages/offline_page_utils.h"
 
 #include <stdint.h>
 #include <utility>
 
 #include "base/callback.h"
@@ skipping 23 matching lines @@
 namespace offline_pages {
 namespace {
 
 const GURL kTestPage1Url("http://test.org/page1");
 const GURL kTestPage2Url("http://test.org/page2");
 const GURL kTestPage3Url("http://test.org/page3");
 const GURL kTestPage4Url("http://test.org/page4");
 const int64_t kTestFileSize = 876543LL;
 const char* kTestPage1ClientId = "1234";
 const char* kTestPage2ClientId = "5678";
-const char* kTestPage4ClientId = "9876";
 
 void BoolCallback(bool* actual_result, bool call_result) {
   DCHECK(actual_result);
   *actual_result = call_result;
 }
 
 }  // namespace
 
 class OfflinePageUtilsTest
     : public testing::Test,
@@ skipping 105 matching lines @@
   client_id.name_space = kDownloadNamespace;
   client_id.id = kTestPage1ClientId;
   SavePage(kTestPage1Url, client_id, std::move(archiver));
 
   // Create page 2.
   archiver = BuildArchiver(kTestPage2Url,
                            base::FilePath(FILE_PATH_LITERAL("page2.mhtml")));
   client_id.id = kTestPage2ClientId;
   SavePage(kTestPage2Url, client_id, std::move(archiver));
 
-  // Create page 4 - expired page.
-  archiver = BuildArchiver(kTestPage4Url,
-                           base::FilePath(FILE_PATH_LITERAL("page4.mhtml")));
-  client_id.id = kTestPage4ClientId;
-  SavePage(kTestPage4Url, client_id, std::move(archiver));
-  RunUntilIdle();
-  model->ExpirePages(
-      std::vector<int64_t>({offline_id()}), base::Time::Now(),
-      base::Bind(&OfflinePageUtilsTest::OnExpirePageDone, AsWeakPtr()));
   RunUntilIdle();

[jianli, 2016/11/18 00:15:48]

This line can also be removed since SavePage waits.

[romax, 2016/11/18 20:50:48]

Done.

 }
 
 std::unique_ptr<OfflinePageTestArchiver> OfflinePageUtilsTest::BuildArchiver(
     const GURL& url,
     const base::FilePath& file_name) {
   std::unique_ptr<OfflinePageTestArchiver> archiver(new OfflinePageTestArchiver(
       this, url, OfflinePageArchiver::ArchiverResult::SUCCESSFULLY_CREATED,
       base::string16(), kTestFileSize, base::ThreadTaskRunnerHandle::Get()));
   archiver->set_filename(file_name);
   return archiver;
 }
 
 TEST_F(OfflinePageUtilsTest, CheckExistenceOfPagesWithURL) {
   bool page_exists = false;
   // This page should be available.
   OfflinePageUtils::CheckExistenceOfPagesWithURL(
       profile(), kDownloadNamespace, kTestPage1Url,
       base::Bind(&BoolCallback, base::Unretained(&page_exists)));
   RunUntilIdle();
   EXPECT_TRUE(page_exists);
   // This one should be missing
   OfflinePageUtils::CheckExistenceOfPagesWithURL(
       profile(), kDownloadNamespace, kTestPage3Url,
       base::Bind(&BoolCallback, base::Unretained(&page_exists)));
   RunUntilIdle();
   EXPECT_FALSE(page_exists);
 }
 
 }  // namespace offline_pages