| Index: chrome/browser/android/offline_pages/offline_page_model_factory.cc
|
| diff --git a/chrome/browser/android/offline_pages/offline_page_model_factory.cc b/chrome/browser/android/offline_pages/offline_page_model_factory.cc
|
| index 29ae3e540fdb3342c9e02b0060b930e7436d950a..3340b8ac192479317295c8efca989ee2d20aca2b 100644
|
| --- a/chrome/browser/android/offline_pages/offline_page_model_factory.cc
|
| +++ b/chrome/browser/android/offline_pages/offline_page_model_factory.cc
|
| @@ -8,17 +8,21 @@
|
|
|
| #include "base/files/file_path.h"
|
| #include "base/memory/singleton.h"
|
| +#include "base/path_service.h"
|
| #include "base/sequenced_task_runner.h"
|
| #include "base/task_scheduler/post_task.h"
|
| -#include "chrome/browser/profiles/incognito_helpers.h"
|
| -#include "chrome/browser/profiles/profile.h"
|
| #include "chrome/common/chrome_constants.h"
|
| #include "components/keyed_service/content/browser_context_dependency_manager.h"
|
| +#include "components/offline_pages/core/archive_manager.h"
|
| +#include "components/offline_pages/core/offline_page_client_policy.h"
|
| #include "components/offline_pages/core/offline_page_metadata_store_sql.h"
|
| #include "components/offline_pages/core/offline_page_model_impl.h"
|
| +#include "content/public/browser/browser_context.h"
|
|
|
| namespace offline_pages {
|
|
|
| +using LifetimeType = LifetimePolicy::LifetimeType;
|
| +
|
| OfflinePageModelFactory::OfflinePageModelFactory()
|
| : BrowserContextKeyedServiceFactory(
|
| "OfflinePageModel",
|
| @@ -39,20 +43,27 @@ OfflinePageModel* OfflinePageModelFactory::GetForBrowserContext(
|
|
|
| KeyedService* OfflinePageModelFactory::BuildServiceInstanceFor(
|
| content::BrowserContext* context) const {
|
| - Profile* profile = Profile::FromBrowserContext(context);
|
| scoped_refptr<base::SequencedTaskRunner> background_task_runner =
|
| base::CreateSequencedTaskRunnerWithTraits({base::MayBlock()});
|
|
|
| base::FilePath store_path =
|
| - profile->GetPath().Append(chrome::kOfflinePageMetadataDirname);
|
| + context->GetPath().Append(chrome::kOfflinePageMetadataDirname);
|
| std::unique_ptr<OfflinePageMetadataStore> metadata_store(
|
| new OfflinePageMetadataStoreSQL(background_task_runner, store_path));
|
|
|
| - base::FilePath archives_dir =
|
| - profile->GetPath().Append(chrome::kOfflinePageArchivesDirname);
|
| + base::FilePath persistent_archives_dir =
|
| + context->GetPath().Append(chrome::kOfflinePageArchivesDirname);
|
| + base::FilePath temporary_archives_dir;
|
| + if (!PathService::Get(base::DIR_CACHE, &temporary_archives_dir))
|
| + NOTREACHED();
|
| + temporary_archives_dir =
|
| + temporary_archives_dir.Append(chrome::kOfflinePageArchivesDirname);
|
| + ArchiveDirectories archive_directories;
|
| + archive_directories[LifetimeType::TEMPORARY] = temporary_archives_dir;
|
| + archive_directories[LifetimeType::PERSISTENT] = persistent_archives_dir;
|
|
|
| - return new OfflinePageModelImpl(std::move(metadata_store), archives_dir,
|
| - background_task_runner);
|
| + return new OfflinePageModelImpl(std::move(metadata_store),
|
| + archive_directories, background_task_runner);
|
| }
|
|
|
| } // namespace offline_pages
|
|
|