Componentize Reading List

components/reading_list/reading_list_model_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 "base/bind.h"
 #include "base/memory/ptr_util.h"
 #import "base/test/ios/wait_util.h"
-#include "ios/chrome/browser/reading_list/reading_list_model_impl.h"
-#include "ios/chrome/browser/reading_list/reading_list_model_storage.h"
+#include "components/reading_list/reading_list_model_impl.h"
+#include "components/reading_list/reading_list_model_storage.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 const GURL callback_url("http://example.com");
 const std::string callback_title("test title");
 
 class TestReadingListStorageObserver {
  public:
   virtual void ReadingListDidSaveEntry() = 0;
@@ skipping 284 matching lines @@
   const ReadingListEntry* local_entry =
       model_->GetEntryFromURL(GURL("http://example.com"), nullptr);
   int64_t local_update_time = local_entry->UpdateTime();
 
   base::test::ios::SpinRunLoopWithMinDelay(
       base::TimeDelta::FromMilliseconds(10));
   auto sync_entry =
       base::MakeUnique<ReadingListEntry>(GURL("http://example.com"), "sample");
   ASSERT_GT(sync_entry->UpdateTime(), local_update_time);
   int64_t sync_update_time = sync_entry->UpdateTime();
-  EXPECT_FALSE(sync_entry->DistilledURL().is_valid());
+  EXPECT_TRUE(sync_entry->DistilledPath().empty());
 
   EXPECT_EQ(model_->unread_size(), 1u);
   EXPECT_EQ(model_->read_size(), 0u);
 
   ReadingListEntry* merged_entry =
       model_->SyncMergeEntry(std::move(sync_entry), true);
   EXPECT_EQ(model_->unread_size(), 0u);
   EXPECT_EQ(model_->read_size(), 1u);
   EXPECT_EQ(merged_entry->DistilledPath(),
             base::FilePath("distilled/page.html"));
@@ skipping 220 matching lines @@
 TEST_F(ReadingListModelTest, UpdateReadDistilledPath) {
   const GURL gurl("http://example.com");
   model_->AddEntry(gurl, "sample");
   model_->MarkReadByURL(gurl);
   const ReadingListEntry& entry = model_->GetReadEntryAtIndex(0);
   ClearCounts();
 
   model_->SetEntryDistilledPath(gurl, base::FilePath("distilled/page.html"));
   AssertObserverCount(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1);
   EXPECT_EQ(ReadingListEntry::PROCESSED, entry.DistilledState());
-  EXPECT_EQ(GURL("chrome://offline/distilled/page.html"), entry.DistilledURL());
+  EXPECT_EQ(base::FilePath("distilled/page.html"), entry.DistilledPath());
 }
 
 // Tests that the callback is called when the entry is unread.
 TEST_F(ReadingListModelTest, CallbackEntryURLUnread) {
   // Setup.
   model_->AddEntry(callback_url, callback_title);
 
   ASSERT_EQ(0UL, model_->read_size());
   ASSERT_EQ(1UL, model_->unread_size());
 
@@ skipping 44 matching lines @@
 }
 
 // Tests that ReadingListModel calls CallbackModelBeingDeleted when destroyed.
 TEST_F(ReadingListModelTest, CallbackModelBeingDeleted) {
   AssertObserverCount(1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
   model_.reset();
   AssertObserverCount(1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0);
 }
 
 }  // namespace