WebApp: Cleanup WebAppDatabase implementation.

Inline CreateStore / OnStoreCreated methods.

Bug: 860583
Change-Id: Ia3d8e0892fb8e2461be6233cad8f33f58f9d4ad8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1816335Reviewed-by: Alan Cutter <alancutter@chromium.org>
Commit-Queue: Alexey Baskakov <loyso@chromium.org>
Cr-Commit-Position: refs/heads/master@{#699241}

chrome/browser/web_applications/web_app_database.cc

@@ -25,16 +25,16 @@ WebAppDatabase::~WebAppDatabase() {
 }
 
 void WebAppDatabase::OpenDatabase(RegistryOpenedCallback callback) {
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   DCHECK(!store_);
 
   syncer::OnceModelTypeStoreFactory store_factory =
       database_factory_->GetStoreFactory();
 
-  // CreateStore then ReadRegistry.
-  CreateStore(
-      std::move(store_factory),
-      base::BindOnce(&WebAppDatabase::ReadRegistry,
-                     weak_ptr_factory_.GetWeakPtr(), std::move(callback)));
+  std::move(store_factory)
+      .Run(syncer::WEB_APPS,
+           base::BindOnce(&WebAppDatabase::OnDatabaseOpened,
+                          weak_ptr_factory_.GetWeakPtr(), std::move(callback)));
 }
 
 void WebAppDatabase::WriteWebApps(AppsToWrite apps,
@@ -201,27 +201,8 @@ std::unique_ptr<WebApp> WebAppDatabase::CreateWebApp(const WebAppProto& proto) {
   return web_app;
 }
 
-void WebAppDatabase::ReadRegistry(RegistryOpenedCallback callback) {
-  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-  DCHECK(store_);
-  store_->ReadAllData(base::BindOnce(&WebAppDatabase::OnAllDataRead,
-                                     weak_ptr_factory_.GetWeakPtr(),
-                                     std::move(callback)));
-}
-
-void WebAppDatabase::CreateStore(
-    syncer::OnceModelTypeStoreFactory store_factory,
-    base::OnceClosure closure) {
-  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-
-  std::move(store_factory)
-      .Run(syncer::WEB_APPS,
-           base::BindOnce(&WebAppDatabase::OnStoreCreated,
-                          weak_ptr_factory_.GetWeakPtr(), std::move(closure)));
-}
-
-void WebAppDatabase::OnStoreCreated(
-    base::OnceClosure closure,
+void WebAppDatabase::OnDatabaseOpened(
+    RegistryOpenedCallback callback,
     const base::Optional<syncer::ModelError>& error,
     std::unique_ptr<syncer::ModelTypeStore> store) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
@@ -231,7 +212,9 @@ void WebAppDatabase::OnStoreCreated(
   }
 
   store_ = std::move(store);
-  std::move(closure).Run();
+  store_->ReadAllData(base::BindOnce(&WebAppDatabase::OnAllDataRead,
+                                     weak_ptr_factory_.GetWeakPtr(),
+                                     std::move(callback)));
 }
 
 void WebAppDatabase::OnAllDataRead(

chrome/browser/web_applications/web_app_database.h

@@ -45,19 +45,15 @@ class WebAppDatabase {
   // Exposed for testing.
   static std::unique_ptr<WebAppProto> CreateWebAppProto(const WebApp& web_app);
   // Exposed for testing.
-  static std::unique_ptr<WebApp> CreateWebApp(const WebAppProto& proto);
-  // Exposed for testing.
-  void ReadRegistry(RegistryOpenedCallback callback);
-  // Exposed for testing.
   static std::unique_ptr<WebApp> ParseWebApp(const AppId& app_id,
                                              const std::string& value);
 
  private:
-  void CreateStore(syncer::OnceModelTypeStoreFactory store_factory,
-                   base::OnceClosure closure);
-  void OnStoreCreated(base::OnceClosure closure,
-                      const base::Optional<syncer::ModelError>& error,
-                      std::unique_ptr<syncer::ModelTypeStore> store);
+  static std::unique_ptr<WebApp> CreateWebApp(const WebAppProto& proto);
+
+  void OnDatabaseOpened(RegistryOpenedCallback callback,
+                        const base::Optional<syncer::ModelError>& error,
+                        std::unique_ptr<syncer::ModelTypeStore> store);
 
   void OnAllDataRead(
       RegistryOpenedCallback callback,