2 files changed, 27 insertions, 24 deletions
diff --git a/chromium/chrome/browser/extensions/api/system_private/system_private_api.cc b/chromium/chrome/browser/extensions/api/system_private/system_private_api.cc
index 99b8663476b..a6571765205 100644
--- a/chromium/chrome/browser/extensions/api/system_private/system_private_api.cc
+++ b/chromium/chrome/browser/extensions/api/system_private/system_private_api.cc
@@ -71,46 +71,49 @@ ExtensionFunction::ResponseAction SystemPrivateGetUpdateStatusFunction::Run() {
 #if defined(OS_CHROMEOS)
   // With UpdateEngineClient, we can provide more detailed information about
   // system updates on ChromeOS.
-  const chromeos::UpdateEngineClient::Status status =
-      chromeos::DBusThreadManager::Get()->GetUpdateEngineClient()->
-      GetLastStatus();
+  const update_engine::StatusResult status = chromeos::DBusThreadManager::Get()
+                                                 ->GetUpdateEngineClient()
+                                                 ->GetLastStatus();
   // |download_progress| is set to 1 after download finishes
   // (i.e. verify, finalize and need-reboot phase) to indicate the progress
   // even though |status.download_progress| is 0 in these phases.
-  switch (status.status) {
-    case chromeos::UpdateEngineClient::UPDATE_STATUS_ERROR:
+  switch (status.current_operation()) {
+    case update_engine::Operation::ERROR:
+    case update_engine::Operation::DISABLED:
       state = kNotAvailableState;
       break;
-    case chromeos::UpdateEngineClient::UPDATE_STATUS_IDLE:
+    case update_engine::Operation::IDLE:
       state = kNotAvailableState;
       break;
-    case chromeos::UpdateEngineClient::UPDATE_STATUS_CHECKING_FOR_UPDATE:
+    case update_engine::Operation::CHECKING_FOR_UPDATE:
       state = kNotAvailableState;
       break;
-    case chromeos::UpdateEngineClient::UPDATE_STATUS_UPDATE_AVAILABLE:
+    case update_engine::Operation::UPDATE_AVAILABLE:
       state = kUpdatingState;
       break;
-    case chromeos::UpdateEngineClient::UPDATE_STATUS_DOWNLOADING:
+    case update_engine::Operation::DOWNLOADING:
       state = kUpdatingState;
-      download_progress = status.download_progress;
+      download_progress = status.progress();
       break;
-    case chromeos::UpdateEngineClient::UPDATE_STATUS_VERIFYING:
+    case update_engine::Operation::VERIFYING:
       state = kUpdatingState;
       download_progress = 1;
       break;
-    case chromeos::UpdateEngineClient::UPDATE_STATUS_FINALIZING:
+    case update_engine::Operation::FINALIZING:
       state = kUpdatingState;
       download_progress = 1;
       break;
-    case chromeos::UpdateEngineClient::UPDATE_STATUS_UPDATED_NEED_REBOOT:
+    case update_engine::Operation::UPDATED_NEED_REBOOT:
       state = kNeedRestartState;
       download_progress = 1;
       break;
-    case chromeos::UpdateEngineClient::UPDATE_STATUS_REPORTING_ERROR_EVENT:
-    case chromeos::UpdateEngineClient::UPDATE_STATUS_ATTEMPTING_ROLLBACK:
-    case chromeos::UpdateEngineClient::UPDATE_STATUS_NEED_PERMISSION_TO_UPDATE:
+    case update_engine::Operation::REPORTING_ERROR_EVENT:
+    case update_engine::Operation::ATTEMPTING_ROLLBACK:
+    case update_engine::Operation::NEED_PERMISSION_TO_UPDATE:
       state = kNotAvailableState;
       break;
+    default:
+      NOTREACHED();
   }
 #else
   if (UpgradeDetector::GetInstance()->notify_upgrade()) {
diff --git a/chromium/chrome/browser/extensions/api/system_private/system_private_apitest.cc b/chromium/chrome/browser/extensions/api/system_private/system_private_apitest.cc
index 6f14af16ebc..c2f658bc796 100644
--- a/chromium/chrome/browser/extensions/api/system_private/system_private_apitest.cc
+++ b/chromium/chrome/browser/extensions/api/system_private/system_private_apitest.cc
@@ -52,14 +52,14 @@ class GetUpdateStatusApiTest : public ExtensionApiTest {
 };
 
 IN_PROC_BROWSER_TEST_F(GetUpdateStatusApiTest, Progress) {
-  UpdateEngineClient::Status status_not_available;
-  status_not_available.status = UpdateEngineClient::UPDATE_STATUS_IDLE;
-  UpdateEngineClient::Status status_updating;
-  status_updating.status = UpdateEngineClient::UPDATE_STATUS_DOWNLOADING;
-  status_updating.download_progress = 0.5;
-  UpdateEngineClient::Status status_boot_needed;
-  status_boot_needed.status =
-      UpdateEngineClient::UPDATE_STATUS_UPDATED_NEED_REBOOT;
+  update_engine::StatusResult status_not_available;
+  status_not_available.set_current_operation(update_engine::Operation::IDLE);
+  update_engine::StatusResult status_updating;
+  status_updating.set_current_operation(update_engine::Operation::DOWNLOADING);
+  status_updating.set_progress(0.5);
+  update_engine::StatusResult status_boot_needed;
+  status_boot_needed.set_current_operation(
+      update_engine::Operation::UPDATED_NEED_REBOOT);
 
   // The fake client returns the last status in this order.
   fake_update_engine_client_->PushLastStatus(status_not_available);