Refactor the UpdateEngine and its actions in the component updater.

chrome/browser/ui/webui/components_ui.cc

 // Copyright 2013 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/ui/webui/components_ui.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/values.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/browser_resources.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/theme_resources.h"
-#include "components/component_updater/component_updater_service.h"
+#include "components/update_client/crx_update_item.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_data_source.h"
 #include "content/public/browser/web_ui_message_handler.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/ui/webui/chromeos/ui_account_tweaks.h"
 #endif
 
@@ skipping 171 matching lines @@
       return l10n_util::GetStringUTF16(IDS_COMPONENTS_EVT_STATUS_UPDATED);
     case Events::COMPONENT_NOT_UPDATED:
       return l10n_util::GetStringUTF16(IDS_COMPONENTS_EVT_STATUS_NOTUPDATED);
     case Events::COMPONENT_UPDATE_DOWNLOADING:
       return l10n_util::GetStringUTF16(IDS_COMPONENTS_EVT_STATUS_DOWNLOADING);
   }
   return l10n_util::GetStringUTF16(IDS_COMPONENTS_UNKNOWN);
 }
 
 base::string16 ComponentsUI::ServiceStatusToString(
-    update_client::CrxUpdateItem::State state) {
+    update_client::ComponentState state) {
   // TODO(sorin): handle kDownloaded. For now, just handle it as kUpdating.
   switch (state) {
-    case update_client::CrxUpdateItem::State::kNew:
+    case update_client::ComponentState::kNew:
       return l10n_util::GetStringUTF16(IDS_COMPONENTS_SVC_STATUS_NEW);
-    case update_client::CrxUpdateItem::State::kChecking:
+    case update_client::ComponentState::kChecking:
       return l10n_util::GetStringUTF16(IDS_COMPONENTS_SVC_STATUS_CHECKING);
-    case update_client::CrxUpdateItem::State::kCanUpdate:
+    case update_client::ComponentState::kCanUpdate:
       return l10n_util::GetStringUTF16(IDS_COMPONENTS_SVC_STATUS_UPDATE);
-    case update_client::CrxUpdateItem::State::kDownloadingDiff:
+    case update_client::ComponentState::kDownloadingDiff:
       return l10n_util::GetStringUTF16(IDS_COMPONENTS_SVC_STATUS_DNL_DIFF);
-    case update_client::CrxUpdateItem::State::kDownloading:
+    case update_client::ComponentState::kDownloading:
       return l10n_util::GetStringUTF16(IDS_COMPONENTS_SVC_STATUS_DNL);
-    case update_client::CrxUpdateItem::State::kUpdatingDiff:
+    case update_client::ComponentState::kUpdatingDiff:
       return l10n_util::GetStringUTF16(IDS_COMPONENTS_SVC_STATUS_UPDT_DIFF);
-    case update_client::CrxUpdateItem::State::kUpdating:
+    case update_client::ComponentState::kUpdating:
       return l10n_util::GetStringUTF16(IDS_COMPONENTS_SVC_STATUS_UPDATING);
-    case update_client::CrxUpdateItem::State::kDownloaded:
+    case update_client::ComponentState::kDownloaded:
       return l10n_util::GetStringUTF16(IDS_COMPONENTS_SVC_STATUS_DOWNLOADED);
-    case update_client::CrxUpdateItem::State::kUpdated:
+    case update_client::ComponentState::kUpdated:
       return l10n_util::GetStringUTF16(IDS_COMPONENTS_SVC_STATUS_UPDATED);
-    case update_client::CrxUpdateItem::State::kUpToDate:
+    case update_client::ComponentState::kUpToDate:
       return l10n_util::GetStringUTF16(IDS_COMPONENTS_SVC_STATUS_UPTODATE);
-    case update_client::CrxUpdateItem::State::kNoUpdate:
+    case update_client::ComponentState::kUpdateError:
       return l10n_util::GetStringUTF16(IDS_COMPONENTS_SVC_STATUS_NOUPDATE);
-    case update_client::CrxUpdateItem::State::kUninstalled:  // Fall through.
-    case update_client::CrxUpdateItem::State::kLastStatus:
+    case update_client::ComponentState::kUninstalled:  // Fall through.
+    case update_client::ComponentState::kLastStatus:
       return l10n_util::GetStringUTF16(IDS_COMPONENTS_UNKNOWN);
   }
   return l10n_util::GetStringUTF16(IDS_COMPONENTS_UNKNOWN);
 }
 
 void ComponentsUI::OnEvent(Events event, const std::string& id) {
   base::DictionaryValue parameters;
   parameters.SetString("event", ComponentEventToString(event));
   if (!id.empty()) {
     if (event == Events::COMPONENT_UPDATED) {
       auto* component_updater = g_browser_process->component_updater();
       update_client::CrxUpdateItem item;
       if (component_updater->GetComponentDetails(id, &item))
         parameters.SetString("version", item.component.version.GetString());
     }
     parameters.SetString("id", id);
   }
   web_ui()->CallJavascriptFunctionUnsafe("onComponentEvent", parameters);
 }