WebApp: Fold BookmarkAppInstallationTask::ResultCode into InstallResultCode.

Merge these two enums.

Move InstallResultCode enum into web_app_constants.h.

kInstallationFailed enumerator entry becomes kFailedUnknownReason.

TBR=jlklein@chromium.org

Bug: 875698
Change-Id: Ia5c2fb46ae0182edf1c8a3b0215f6905ad70f094
Reviewed-on: https://chromium-review.googlesource.com/c/1285871
Commit-Queue: Alexey Baskakov <loyso@chromium.org>
Reviewed-by: Ben Wells <benwells@chromium.org>
Cr-Commit-Position: refs/heads/master@{#600280}

chrome/browser/chromeos/multidevice_setup/android_sms_app_helper_delegate_impl.cc

@@ -14,7 +14,6 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/extensions/app_launch_params.h"
 #include "chrome/browser/ui/extensions/application_launch.h"
-#include "chrome/browser/web_applications/components/install_result_code.h"
 #include "chrome/browser/web_applications/components/pending_app_manager.h"
 #include "chrome/browser/web_applications/components/web_app_constants.h"
 #include "chrome/browser/web_applications/web_app_provider.h"

chrome/browser/web_applications/components/BUILD.gn

@@ -5,7 +5,6 @@
 source_set("components") {
   sources = [
     "install_manager.h",
-    "install_result_code.h",
     "pending_app_manager.cc",
     "pending_app_manager.h",
     "web_app_constants.h",

chrome/browser/web_applications/components/install_result_code.h

-// Copyright 2018 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.
-
-#ifndef CHROME_BROWSER_WEB_APPLICATIONS_COMPONENTS_INSTALL_RESULT_CODE_H_
-#define CHROME_BROWSER_WEB_APPLICATIONS_COMPONENTS_INSTALL_RESULT_CODE_H_
-
-namespace web_app {
-
-// The result of an attempted web app installation, uninstallation or update.
-//
-// This is an enum, instead of a struct with multiple fields (e.g. one field for
-// success or failure, one field for whether action was taken), because we want
-// to track metrics for the overall cross product of the these axes.
-//
-// TODO(nigeltao): fold BookmarkAppInstallationTask::ResultCode into this class.
-enum class InstallResultCode {
-  kSuccess,
-  kAlreadyInstalled,
-  // Catch-all failure category. More-specific failure categories are below.
-  kFailedUnknownReason,
-  kGetWebApplicationInfoFailed,
-  kPreviouslyUninstalled,
-};
-
-}  // namespace web_app
-
-#endif  // CHROME_BROWSER_WEB_APPLICATIONS_COMPONENTS_INSTALL_RESULT_CODE_H_

chrome/browser/web_applications/components/test_pending_app_manager.cc

@@ -8,7 +8,7 @@
 #include <utility>
 
 #include "base/callback.h"
-#include "chrome/browser/web_applications/components/install_result_code.h"
+#include "chrome/browser/web_applications/components/web_app_constants.h"
 #include "url/gurl.h"
 
 namespace web_app {

chrome/browser/web_applications/components/web_app_constants.h

@@ -17,6 +17,20 @@ enum class LaunchContainer {
   kWindow,
 };
 
+// The result of an attempted web app installation, uninstallation or update.
+//
+// This is an enum, instead of a struct with multiple fields (e.g. one field for
+// success or failure, one field for whether action was taken), because we want
+// to track metrics for the overall cross product of the these axes.
+enum class InstallResultCode {
+  kSuccess,
+  kAlreadyInstalled,
+  // Catch-all failure category. More-specific failure categories are below.
+  kFailedUnknownReason,
+  kGetWebApplicationInfoFailed,
+  kPreviouslyUninstalled,
+};
+
 // Where an app was installed from. This affects what flags will be used when
 // installing the app.
 //

chrome/browser/web_applications/extensions/bookmark_app_installation_task.cc

@@ -36,10 +36,10 @@ std::unique_ptr<BookmarkAppHelper> BookmarkAppHelperCreateWrapper(
 
 }  // namespace
 
-BookmarkAppInstallationTask::Result::Result(ResultCode code,
+BookmarkAppInstallationTask::Result::Result(web_app::InstallResultCode code,
                                             base::Optional<std::string> app_id)
     : code(code), app_id(std::move(app_id)) {
-  DCHECK_EQ(code == ResultCode::kSuccess, app_id.has_value());
+  DCHECK_EQ(code == web_app::InstallResultCode::kSuccess, app_id.has_value());
 }
 
 BookmarkAppInstallationTask::Result::Result(Result&&) = default;
@@ -98,7 +98,8 @@ void BookmarkAppInstallationTask::OnGetWebApplicationInfo(
     std::unique_ptr<WebApplicationInfo> web_app_info) {
   if (!web_app_info) {
     std::move(result_callback)
-        .Run(Result(ResultCode::kGetWebApplicationInfoFailed, std::string()));
+        .Run(Result(web_app::InstallResultCode::kGetWebApplicationInfoFailed,
+                    std::string()));
     return;
   }
 
@@ -149,8 +150,10 @@ void BookmarkAppInstallationTask::OnInstalled(
     const Extension* extension,
     const WebApplicationInfo& web_app_info) {
   std::move(result_callback)
-      .Run(extension ? Result(ResultCode::kSuccess, extension->id())
-                     : Result(ResultCode::kInstallationFailed, base::nullopt));
+      .Run(extension
+               ? Result(web_app::InstallResultCode::kSuccess, extension->id())
+               : Result(web_app::InstallResultCode::kFailedUnknownReason,
+                        base::nullopt));
 }
 
 }  // namespace extensions

chrome/browser/web_applications/extensions/bookmark_app_installation_task.h

@@ -24,6 +24,7 @@ class WebContents;
 
 namespace web_app {
 class WebAppDataRetriever;
+enum class InstallResultCode;
 }
 
 namespace extensions {
@@ -36,19 +37,12 @@ class Extension;
 // or WebApplicationInfo. Can only be called from the UI thread.
 class BookmarkAppInstallationTask {
  public:
-  // TODO(nigeltao): fold this into web_app::InstallResultCode.
-  enum class ResultCode {
-    kSuccess,
-    kGetWebApplicationInfoFailed,
-    kInstallationFailed,
-  };
-
   struct Result {
-    Result(ResultCode code, base::Optional<std::string> app_id);
+    Result(web_app::InstallResultCode code, base::Optional<std::string> app_id);
     Result(Result&&);
     ~Result();
 
-    const ResultCode code;
+    const web_app::InstallResultCode code;
     const base::Optional<std::string> app_id;
 
     DISALLOW_COPY_AND_ASSIGN(Result);

chrome/browser/web_applications/extensions/bookmark_app_installation_task_unittest.cc

@@ -40,7 +40,6 @@
 namespace extensions {
 
 using Result = BookmarkAppInstallationTask::Result;
-using ResultCode = BookmarkAppInstallationTask::ResultCode;
 
 namespace {
 
@@ -128,7 +127,8 @@ class BookmarkAppInstallationTaskTest : public ChromeRenderViewHostTestHarness {
   }
 
   bool app_installed() {
-    bool app_installed = app_installation_result_->code == ResultCode::kSuccess;
+    bool app_installed =
+        app_installation_result_->code == web_app::InstallResultCode::kSuccess;
     EXPECT_EQ(app_installed, app_installation_result_->app_id.has_value());
     return app_installed;
   }
@@ -209,9 +209,8 @@ TEST_F(BookmarkAppInstallationTaskTest, ShortcutFromContents_NoWebAppInfo) {
   run_loop.Run();
 
   EXPECT_FALSE(app_installed());
-  EXPECT_EQ(
-      BookmarkAppInstallationTask::ResultCode::kGetWebApplicationInfoFailed,
-      app_installation_result().code);
+  EXPECT_EQ(web_app::InstallResultCode::kGetWebApplicationInfoFailed,
+            app_installation_result().code);
 }
 
 TEST_F(BookmarkAppInstallationTaskTest, ShortcutFromContents_NoManifest) {
@@ -262,7 +261,7 @@ TEST_F(BookmarkAppInstallationTaskTest,
   run_loop.Run();
 
   EXPECT_FALSE(app_installed());
-  EXPECT_EQ(BookmarkAppInstallationTask::ResultCode::kInstallationFailed,
+  EXPECT_EQ(web_app::InstallResultCode::kFailedUnknownReason,
             app_installation_result().code);
 }
 

chrome/browser/web_applications/extensions/bookmark_app_shortcut_installation_task.cc

@@ -53,7 +53,8 @@ void BookmarkAppShortcutInstallationTask::OnGetWebApplicationInfo(
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   if (!web_app_info) {
     std::move(result_callback)
-        .Run(Result(ResultCode::kGetWebApplicationInfoFailed, base::nullopt));
+        .Run(Result(web_app::InstallResultCode::kGetWebApplicationInfoFailed,
+                    base::nullopt));
     return;
   }
 
@@ -91,10 +92,12 @@ void BookmarkAppShortcutInstallationTask::OnInstalled(
     const std::string& app_id) {
   if (app_id.empty()) {
     std::move(result_callback)
-        .Run(Result(ResultCode::kInstallationFailed, base::nullopt));
+        .Run(Result(web_app::InstallResultCode::kFailedUnknownReason,
+                    base::nullopt));
     return;
   }
-  std::move(result_callback).Run(Result(ResultCode::kSuccess, app_id));
+  std::move(result_callback)
+      .Run(Result(web_app::InstallResultCode::kSuccess, app_id));
 }
 
 }  // namespace extensions

chrome/browser/web_applications/extensions/pending_bookmark_app_manager.cc

@@ -14,7 +14,6 @@
 #include "base/time/time.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/web_applications/components/install_result_code.h"
 #include "chrome/browser/web_applications/components/web_app_constants.h"
 #include "chrome/browser/web_applications/extensions/bookmark_app_shortcut_installation_task.h"
 #include "content/public/browser/navigation_controller.h"

chrome/browser/web_applications/extensions/pending_bookmark_app_manager_browsertest.cc

@@ -12,7 +12,6 @@
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
-#include "chrome/browser/web_applications/components/install_result_code.h"
 #include "chrome/browser/web_applications/components/web_app_constants.h"
 #include "chrome/browser/web_applications/extensions/web_app_extension_ids_map.h"
 #include "chrome/browser/web_applications/web_app_provider.h"

chrome/browser/web_applications/extensions/pending_bookmark_app_manager_unittest.cc

@@ -16,7 +16,6 @@
 #include "base/test/bind_test_util.h"
 #include "base/timer/mock_timer.h"
 #include "chrome/browser/extensions/test_extension_system.h"
-#include "chrome/browser/web_applications/components/install_result_code.h"
 #include "chrome/browser/web_applications/components/pending_app_manager.h"
 #include "chrome/browser/web_applications/components/web_app_constants.h"
 #include "chrome/browser/web_applications/extensions/bookmark_app_installation_task.h"
@@ -126,11 +125,10 @@ class TestBookmarkAppInstallationTask : public BookmarkAppInstallationTask {
   void InstallWebAppOrShortcutFromWebContents(
       content::WebContents* web_contents,
       BookmarkAppInstallationTask::ResultCallback callback) override {
-    BookmarkAppInstallationTask::ResultCode result_code =
-        BookmarkAppInstallationTask::ResultCode::kInstallationFailed;
+    auto result_code = web_app::InstallResultCode::kFailedUnknownReason;
     std::string app_id;
     if (succeeds_) {
-      result_code = BookmarkAppInstallationTask::ResultCode::kSuccess;
+      result_code = web_app::InstallResultCode::kSuccess;
       app_id = GenerateFakeAppId(app_info().url);
       ExtensionRegistry::Get(profile_)->AddEnabled(
           CreateDummyExtension(app_id));

chrome/browser/web_applications/web_app_install_manager.cc

@@ -7,7 +7,7 @@
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/web_applications/components/install_result_code.h"
+#include "chrome/browser/web_applications/components/web_app_constants.h"
 #include "chrome/browser/web_applications/components/web_app_data_retriever.h"
 #include "chrome/browser/web_applications/components/web_app_helpers.h"
 #include "chrome/browser/web_applications/web_app.h"

chrome/browser/web_applications/web_app_install_manager_unittest.cc

@@ -8,7 +8,7 @@
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/bind_test_util.h"
-#include "chrome/browser/web_applications/components/install_result_code.h"
+#include "chrome/browser/web_applications/components/web_app_constants.h"
 #include "chrome/browser/web_applications/test/test_data_retriever.h"
 #include "chrome/browser/web_applications/test/web_app_test.h"
 #include "chrome/browser/web_applications/web_app.h"