[Offline pages] Completely remove offliner factory.

chrome/browser/android/offline_pages/request_coordinator_factory.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 "chrome/browser/android/offline_pages/request_coordinator_factory.h"
 
 #include <memory>
 
 #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"
 #include "components/offline_pages/core/background/request_queue_store.h"
 #include "components/offline_pages/core/background/request_queue_store_sql.h"
 #include "components/offline_pages/core/background/scheduler.h"
 #include "components/offline_pages/core/downloads/download_notifying_observer.h"
 #include "components/offline_pages/core/offline_page_feature.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/nqe/network_quality_estimator.h"
@@ skipping 13 matching lines @@
 // static
 RequestCoordinator* RequestCoordinatorFactory::GetForBrowserContext(
     content::BrowserContext* context) {
   return static_cast<RequestCoordinator*>(
       GetInstance()->GetServiceForBrowserContext(context, true));
 }
 
 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' constructor parameter. Would be nice
not to pass a raw pointer like this at all.

[chili, 2017/01/09 18:08:19]

Will do in a separate CL.  Want to keep this CL related to the offliner
factories

   } else {
-    offliner.reset(new PrerenderingOfflinerFactory(context));
+    offliner.reset(new PrerenderingOffliner(context, policy.get(), model));
   }
 
   scoped_refptr<base::SequencedTaskRunner> background_task_runner =
       content::BrowserThread::GetBlockingPool()->GetSequencedTaskRunner(
           content::BrowserThread::GetBlockingPool()->GetSequenceToken());
   Profile* profile = Profile::FromBrowserContext(context);
   base::FilePath queue_store_path =
       profile->GetPath().Append(chrome::kOfflinePageRequestQueueDirname);
 
   std::unique_ptr<RequestQueueStoreSQL> queue_store(
@@ skipping 11 matching lines @@
       std::move(scheduler), network_quality_estimator);
 
   DownloadNotifyingObserver::CreateAndStartObserving(
       request_coordinator,
       base::MakeUnique<android::OfflinePageNotificationBridge>());
 
   return request_coordinator;
 }
 
 }  // namespace offline_pages