Remove OfflineURL from offline page

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 46 matching lines @@
 
   // Necessary callbacks for the offline page model.
   void OnSavePageDone(SavePageResult result, int64_t offlineId);
   void OnClearAllDone();
   void OnExpirePageDone(bool success);
   void OnGetURLDone(const GURL& url);
 
   // OfflinePageTestArchiver::Observer implementation:
   void SetLastPathCreatedByArchiver(const base::FilePath& file_path) override;
 
-  // Offline page URL for the first page.
-  const GURL& offline_url_page_1() const { return offline_url_page_1_; }
-  // Offline page URL for the second page.
-  const GURL& offline_url_page_2() const { return offline_url_page_2_; }
-  // Offline page URL not related to any page.
-  const GURL& offline_url_missing() const { return offline_url_missing_; }
-  // Offline page URL for expired page.
-  const GURL& offline_url_expired() const { return offline_url_expired_; }
-
   TestingProfile* profile() { return &profile_; }
 
   int64_t offline_id() const { return offline_id_; }
 
  private:
   void CreateOfflinePages();
   std::unique_ptr<OfflinePageTestArchiver> BuildArchiver(
       const GURL& url,
       const base::FilePath& file_name);
 
-  GURL offline_url_page_1_;
-  GURL offline_url_page_2_;
-  GURL offline_url_missing_;
-  GURL offline_url_expired_;
-
   int64_t offline_id_;
   GURL url_;
 
   scoped_refptr<base::TestSimpleTaskRunner> task_runner_;
   base::ThreadTaskRunnerHandle task_runner_handle_;
   TestingProfile profile_;
 };
 
 OfflinePageUtilsTest::OfflinePageUtilsTest()
     : task_runner_(new base::TestSimpleTaskRunner),
@@ skipping 51 matching lines @@
   // Create page 1.
   std::unique_ptr<OfflinePageTestArchiver> archiver(BuildArchiver(
       kTestPage1Url, base::FilePath(FILE_PATH_LITERAL("page1.mhtml"))));
   offline_pages::ClientId client_id;
   client_id.name_space = kBookmarkNamespace;
   client_id.id = kTestPage1ClientId;
   model->SavePage(
       kTestPage1Url, client_id, 0ul, std::move(archiver),
       base::Bind(&OfflinePageUtilsTest::OnSavePageDone, AsWeakPtr()));
   RunUntilIdle();
-  offline_url_page_1_ =
-      model->MaybeGetPageByOfflineId(offline_id())->GetOfflineURL();
 
   // Create page 2.
   archiver = BuildArchiver(kTestPage2Url,
                            base::FilePath(FILE_PATH_LITERAL("page2.mhtml")));
   client_id.id = kTestPage2ClientId;
   model->SavePage(
       kTestPage2Url, client_id, 0ul, std::move(archiver),
       base::Bind(&OfflinePageUtilsTest::OnSavePageDone, AsWeakPtr()));
   RunUntilIdle();
-  offline_url_page_2_ =
-      model->MaybeGetPageByOfflineId(offline_id())->GetOfflineURL();
-
-  // Page 3 is not created, as it is missing.
-  // Create a file path that is not associated with any offline page.
-  offline_url_missing_ = net::FilePathToFileURL(
-      profile()
-          ->GetPath()
-          .Append(chrome::kOfflinePageArchivesDirname)
-          .Append(FILE_PATH_LITERAL("missing_file.mhtml")));
 
   // Create page 4 - expired page.
   archiver = BuildArchiver(kTestPage4Url,
                            base::FilePath(FILE_PATH_LITERAL("page4.mhtml")));
   client_id.id = kTestPage4ClientId;
   model->SavePage(
       kTestPage4Url, client_id, 0ul, std::move(archiver),
       base::Bind(&OfflinePageUtilsTest::OnSavePageDone, AsWeakPtr()));
   RunUntilIdle();
-  const OfflinePageItem* page_4 = model->MaybeGetPageByOfflineId(offline_id());
-  offline_url_expired_ = page_4->GetOfflineURL();
   model->ExpirePages(
       std::vector<int64_t>({offline_id()}), base::Time::Now(),
       base::Bind(&OfflinePageUtilsTest::OnExpirePageDone, AsWeakPtr()));
   RunUntilIdle();
 }
 
 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, MightBeOfflineURL) {
-  // URL is invalid.
-  EXPECT_FALSE(OfflinePageUtils::MightBeOfflineURL(GURL("/test.mhtml")));
-  // Scheme is not file.
-  EXPECT_FALSE(OfflinePageUtils::MightBeOfflineURL(GURL("http://test.com/")));
-  // Does not end with .mhtml.
-  EXPECT_FALSE(OfflinePageUtils::MightBeOfflineURL(GURL("file:///test.txt")));
-  // Might still be an offline page.
-  EXPECT_TRUE(OfflinePageUtils::MightBeOfflineURL(GURL("file:///test.mhtml")));
-}
-
-TEST_F(OfflinePageUtilsTest, MaybeGetOnlineURLForOfflineURL) {
-  EXPECT_EQ(kTestPage1Url, OfflinePageUtils::MaybeGetOnlineURLForOfflineURL(
-                               profile(), offline_url_page_1()));
-  EXPECT_EQ(kTestPage2Url, OfflinePageUtils::MaybeGetOnlineURLForOfflineURL(
-                               profile(), offline_url_page_2()));
-  EXPECT_EQ(GURL::EmptyGURL(), OfflinePageUtils::MaybeGetOnlineURLForOfflineURL(
-                                   profile(), offline_url_missing()));
-  EXPECT_EQ(kTestPage4Url, OfflinePageUtils::MaybeGetOnlineURLForOfflineURL(
-                               profile(), offline_url_expired()));
-}
-
-TEST_F(OfflinePageUtilsTest, IsOfflinePage) {
-  EXPECT_TRUE(OfflinePageUtils::IsOfflinePage(profile(), offline_url_page_1()));
-  EXPECT_TRUE(OfflinePageUtils::IsOfflinePage(profile(), offline_url_page_2()));
-  EXPECT_FALSE(
-      OfflinePageUtils::IsOfflinePage(profile(), offline_url_missing()));
-  EXPECT_TRUE(
-      OfflinePageUtils::IsOfflinePage(profile(), offline_url_expired()));
-  EXPECT_FALSE(OfflinePageUtils::IsOfflinePage(profile(), kTestPage1Url));
-  EXPECT_FALSE(OfflinePageUtils::IsOfflinePage(profile(), kTestPage2Url));
-  EXPECT_FALSE(OfflinePageUtils::IsOfflinePage(profile(), kTestPage4Url));
-}
-
 }  // namespace offline_pages