[Feed] Feed Storage Initialization

Implement feed storage initialization in C++.

Bug:828938

Change-Id: I33a5a9e2e7dd20c36ec945feab6ea9932e9d94a2
Reviewed-on: https://chromium-review.googlesource.com/1121834Reviewed-by: Filip Gorski <fgorski@chromium.org>
Commit-Queue: Gang Wu <gangwu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#574386}

chrome/browser/android/feed/feed_host_service_factory.cc

@@ -18,6 +18,7 @@
 #include "components/feed/core/feed_image_manager.h"
 #include "components/feed/core/feed_networking_host.h"
 #include "components/feed/core/feed_scheduler_host.h"
+#include "components/feed/core/feed_storage_database.h"
 #include "components/image_fetcher/core/image_fetcher_impl.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "components/version_info/version_info.h"
@@ -85,9 +86,11 @@ KeyedService* FeedHostServiceFactory::BuildServiceInstanceFor(
   auto scheduler_host = std::make_unique<FeedSchedulerHost>(
       profile->GetPrefs(), base::DefaultClock::GetInstance());
 
-  return new FeedHostService(std::move(image_manager),
-                             std::move(networking_host),
-                             std::move(scheduler_host));
+  auto storage_database = std::make_unique<FeedStorageDatabase>(feed_dir);
+
+  return new FeedHostService(
+      std::move(image_manager), std::move(networking_host),
+      std::move(scheduler_host), std::move(storage_database));
 }
 
 content::BrowserContext* FeedHostServiceFactory::GetBrowserContextToUse(

components/feed/core/feed_host_service.cc

@@ -11,10 +11,12 @@ namespace feed {
 FeedHostService::FeedHostService(
     std::unique_ptr<FeedImageManager> image_manager,
     std::unique_ptr<FeedNetworkingHost> networking_host,
-    std::unique_ptr<FeedSchedulerHost> scheduler_host)
+    std::unique_ptr<FeedSchedulerHost> scheduler_host,
+    std::unique_ptr<FeedStorageDatabase> storage_database)
     : image_manager_(std::move(image_manager)),
       networking_host_(std::move(networking_host)),
-      scheduler_host_(std::move(scheduler_host)) {}
+      scheduler_host_(std::move(scheduler_host)),
+      storage_database_(std::move(storage_database)) {}
 
 FeedHostService::~FeedHostService() = default;
 
@@ -30,4 +32,8 @@ FeedSchedulerHost* FeedHostService::GetSchedulerHost() {
   return scheduler_host_.get();
 }
 
+FeedStorageDatabase* FeedHostService::GetStorageDatabase() {
+  return storage_database_.get();
+}
+
 }  // namespace feed

components/feed/core/feed_host_service.h

@@ -11,6 +11,7 @@
 #include "components/feed/core/feed_image_manager.h"
 #include "components/feed/core/feed_networking_host.h"
 #include "components/feed/core/feed_scheduler_host.h"
+#include "components/feed/core/feed_storage_database.h"
 #include "components/keyed_service/core/keyed_service.h"
 
 namespace feed {
@@ -24,17 +25,20 @@ class FeedHostService : public KeyedService {
  public:
   FeedHostService(std::unique_ptr<FeedImageManager> image_manager,
                   std::unique_ptr<FeedNetworkingHost> networking_host,
-                  std::unique_ptr<FeedSchedulerHost> scheduler_host);
+                  std::unique_ptr<FeedSchedulerHost> scheduler_host,
+                  std::unique_ptr<FeedStorageDatabase> storage_database);
   ~FeedHostService() override;
 
   FeedImageManager* GetImageManager();
   FeedNetworkingHost* GetNetworkingHost();
   FeedSchedulerHost* GetSchedulerHost();
+  FeedStorageDatabase* GetStorageDatabase();
 
  private:
   std::unique_ptr<FeedImageManager> image_manager_;
   std::unique_ptr<FeedNetworkingHost> networking_host_;
   std::unique_ptr<FeedSchedulerHost> scheduler_host_;
+  std::unique_ptr<FeedStorageDatabase> storage_database_;
 
   DISALLOW_COPY_AND_ASSIGN(FeedHostService);
 };

components/feed/core/feed_storage_database.cc

@@ -75,13 +75,13 @@ bool DatabasePrefixFilter(const std::string& key_prefix,
 
 }  // namespace
 
-FeedStorageDatabase::FeedStorageDatabase(
-    const base::FilePath& database_folder,
-    const scoped_refptr<base::SequencedTaskRunner>& task_runner)
+FeedStorageDatabase::FeedStorageDatabase(const base::FilePath& database_folder)
     : FeedStorageDatabase(
           database_folder,
           std::make_unique<leveldb_proto::ProtoDatabaseImpl<FeedStorageProto>>(
-              task_runner)) {}
+              base::CreateSequencedTaskRunnerWithTraits(
+                  {base::MayBlock(), base::TaskPriority::BACKGROUND,
+                   base::TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN}))) {}
 
 FeedStorageDatabase::FeedStorageDatabase(
     const base::FilePath& database_folder,

components/feed/core/feed_storage_database.h

@@ -49,9 +49,7 @@ class FeedStorageDatabase {
   using ConfirmationCallback = base::OnceCallback<void(bool)>;
 
   // Initializes the database with |database_folder|.
-  FeedStorageDatabase(
-      const base::FilePath& database_folder,
-      const scoped_refptr<base::SequencedTaskRunner>& task_runner);
+  explicit FeedStorageDatabase(const base::FilePath& database_folder);
 
   // Initializes the database with |database_folder|. Creates storage using the
   // given |storage_database| for local storage. Useful for testing.