chrome/browser/android/offline_pages/request_coordinator_factory.cc - Issue 2609713002: [Offline pages] Completely remove offliner factory.

Unified Diff: chrome/browser/android/offline_pages/request_coordinator_factory.cc

Issue 2609713002: [Offline pages] Completely remove offliner factory. (Closed)

Patch Set: add TODO Created 3 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

« no previous file with comments | « chrome/browser/android/offline_pages/prerendering_offliner_factory.cc ('k') | chrome/browser/android/offline_pages/test_request_coordinator_builder.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/android/offline_pages/request_coordinator_factory.cc

diff --git a/chrome/browser/android/offline_pages/request_coordinator_factory.cc b/chrome/browser/android/offline_pages/request_coordinator_factory.cc

index d68fb734e6695e5f75bd7881439ad78b3a8892e5..f7727c154c1a07d133fb4c043f61c5cad401bcea 100644

--- a/chrome/browser/android/offline_pages/request_coordinator_factory.cc

+++ b/chrome/browser/android/offline_pages/request_coordinator_factory.cc

@@ -9,16 +9,17 @@

#include "base/memory/ptr_util.h"

#include "base/memory/singleton.h"

#include "base/sequenced_task_runner.h"

-#include "chrome/browser/android/offline_pages/background_loader_offliner_factory.h"

+#include "chrome/browser/android/offline_pages/background_loader_offliner.h"

#include "chrome/browser/android/offline_pages/background_scheduler_bridge.h"

#include "chrome/browser/android/offline_pages/downloads/offline_page_notification_bridge.h"

-#include "chrome/browser/android/offline_pages/prerendering_offliner_factory.h"

+#include "chrome/browser/android/offline_pages/offline_page_model_factory.h"

+#include "chrome/browser/android/offline_pages/prerendering_offliner.h"

#include "chrome/browser/net/nqe/ui_network_quality_estimator_service.h"

#include "chrome/browser/net/nqe/ui_network_quality_estimator_service_factory.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/background/offliner_factory.h"

+#include "components/offline_pages/core/background/offliner.h"

#include "components/offline_pages/core/background/offliner_policy.h"

#include "components/offline_pages/core/background/request_coordinator.h"

#include "components/offline_pages/core/background/request_queue.h"

@@ -52,13 +53,15 @@ RequestCoordinator* RequestCoordinatorFactory::GetForBrowserContext(

KeyedService* RequestCoordinatorFactory::BuildServiceInstanceFor(

content::BrowserContext* context) const {

std::unique_ptr<OfflinerPolicy> policy(new OfflinerPolicy());

- std::unique_ptr<OfflinerFactory> offliner;

+ std::unique_ptr<Offliner> offliner;

+ OfflinePageModel* model =

+ OfflinePageModelFactory::GetInstance()->GetForBrowserContext(context);

// Determines which offliner to use based on flag.

if (ShouldUseNewBackgroundLoader()) {

- offliner.reset(new BackgroundLoaderOfflinerFactory(context));

+ offliner.reset(new BackgroundLoaderOffliner(context, policy.get(), model));

Dmitry Titov 2017/01/06 02:30:44 Neither of both offliners ever use 'policy' constr

chili 2017/01/09 18:08:19 Will do in a separate CL. Want to keep this CL re

} else {

- offliner.reset(new PrerenderingOfflinerFactory(context));

+ offliner.reset(new PrerenderingOffliner(context, policy.get(), model));

}

scoped_refptr<base::SequencedTaskRunner> background_task_runner =