Move most of the component updater artifacts to update_client.

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 <algorithm>
 #include <string>
 #include <vector>
 
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/component_updater/component_updater_service.h"
-#include "components/component_updater/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 "grit/browser_resources.h"
 #include "grit/theme_resources.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"
@@ skipping 130 matching lines @@
 // static
 base::ListValue* ComponentsUI::LoadComponents() {
   component_updater::ComponentUpdateService* cus =
       g_browser_process->component_updater();
   std::vector<std::string> component_ids;
   component_ids = cus->GetComponentIDs();
 
   // Construct DictionaryValues to return to UI.
   base::ListValue* component_list = new base::ListValue();
   for (size_t j = 0; j < component_ids.size(); ++j) {
-    component_updater::CrxUpdateItem item;
+    update_client::CrxUpdateItem item;
     if (cus->GetComponentDetails(component_ids[j], &item)) {
       base::DictionaryValue* component_entry = new base::DictionaryValue();
       component_entry->SetString("id", component_ids[j]);
       component_entry->SetString("name", item.component.name);
       component_entry->SetString("version", item.component.version.GetString());
       component_entry->SetString("status", ServiceStatusToString(item.status));
       component_list->Append(component_entry);
     }
   }
 
@@ skipping 21 matching lines @@
       return l10n_util::GetStringUTF16(IDS_COMPONENTS_EVT_STATUS_UPDATED);
     case COMPONENT_NOT_UPDATED:
       return l10n_util::GetStringUTF16(IDS_COMPONENTS_EVT_STATUS_NOTUPDATED);
     case COMPONENT_UPDATE_DOWNLOADING:
       return l10n_util::GetStringUTF16(IDS_COMPONENTS_EVT_STATUS_DOWNLOADING);
   }
   return l10n_util::GetStringUTF16(IDS_COMPONENTS_UNKNOWN);
 }
 
 base::string16 ComponentsUI::ServiceStatusToString(
-    component_updater::CrxUpdateItem::Status status) {
+    update_client::CrxUpdateItem::Status status) {
   switch (status) {
-    case component_updater::CrxUpdateItem::kNew:
+    case update_client::CrxUpdateItem::kNew:
       return l10n_util::GetStringUTF16(IDS_COMPONENTS_SVC_STATUS_NEW);
-    case component_updater::CrxUpdateItem::kChecking:
+    case update_client::CrxUpdateItem::kChecking:
       return l10n_util::GetStringUTF16(IDS_COMPONENTS_SVC_STATUS_CHECKING);
-    case component_updater::CrxUpdateItem::kCanUpdate:
+    case update_client::CrxUpdateItem::kCanUpdate:
       return l10n_util::GetStringUTF16(IDS_COMPONENTS_SVC_STATUS_UPDATE);
-    case component_updater::CrxUpdateItem::kDownloadingDiff:
+    case update_client::CrxUpdateItem::kDownloadingDiff:
       return l10n_util::GetStringUTF16(IDS_COMPONENTS_SVC_STATUS_DNL_DIFF);
-    case component_updater::CrxUpdateItem::kDownloading:
+    case update_client::CrxUpdateItem::kDownloading:
       return l10n_util::GetStringUTF16(IDS_COMPONENTS_SVC_STATUS_DNL);
-    case component_updater::CrxUpdateItem::kUpdatingDiff:
+    case update_client::CrxUpdateItem::kUpdatingDiff:
       return l10n_util::GetStringUTF16(IDS_COMPONENTS_SVC_STATUS_UPDT_DIFF);
-    case component_updater::CrxUpdateItem::kUpdating:
+    case update_client::CrxUpdateItem::kUpdating:
       return l10n_util::GetStringUTF16(IDS_COMPONENTS_SVC_STATUS_UPDATING);
-    case component_updater::CrxUpdateItem::kUpdated:
+    case update_client::CrxUpdateItem::kUpdated:
       return l10n_util::GetStringUTF16(IDS_COMPONENTS_SVC_STATUS_UPDATED);
-    case component_updater::CrxUpdateItem::kUpToDate:
+    case update_client::CrxUpdateItem::kUpToDate:
       return l10n_util::GetStringUTF16(IDS_COMPONENTS_SVC_STATUS_UPTODATE);
-    case component_updater::CrxUpdateItem::kNoUpdate:
+    case update_client::CrxUpdateItem::kNoUpdate:
       return l10n_util::GetStringUTF16(IDS_COMPONENTS_SVC_STATUS_NOUPDATE);
-    case component_updater::CrxUpdateItem::kLastStatus:
+    case update_client::CrxUpdateItem::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()) {
     using component_updater::ComponentUpdateService;
     if (event == ComponentUpdateService::Observer::COMPONENT_UPDATED) {
       ComponentUpdateService* cus = g_browser_process->component_updater();
-      component_updater::CrxUpdateItem item;
+      update_client::CrxUpdateItem item;
       if (cus->GetComponentDetails(id, &item))
         parameters.SetString("version", item.component.version.GetString());
     }
     parameters.SetString("id", id);
   }
   web_ui()->CallJavascriptFunction("onComponentEvent", parameters);
 }