Rename NEW_READY to READY

Now that the |AssistantState::READY| flag has been removed,
we can rename the NEW_READY flag to READY.

Bug: b/142428671
Change-Id: If874e8e856e34fefe75e0b39c937258f255261d6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2236289
Commit-Queue: Jeroen Dhollander <jeroendh@google.com>
Reviewed-by: Xiaohui Chen <xiaohuic@chromium.org>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#776569}

ash/assistant/test/assistant_ash_test_base.cc

@@ -128,7 +128,7 @@ void AssistantAshTestBase::SetUp() {
   // At this point our Assistant service is ready for use.
   // Indicate this by changing status from NOT_READY to READY.
   test_api_->GetAssistantState()->NotifyStatusChanged(
-      chromeos::assistant::AssistantStatus::NEW_READY);
+      chromeos::assistant::AssistantStatus::READY);
 
   test_api_->DisableAnimations();
 

ash/shelf/home_button_unittest.cc

@@ -536,7 +536,7 @@ TEST_P(HomeButtonTest, LongPressGesture) {
   assistant_state()->NotifyFeatureAllowed(
       chromeos::assistant::AssistantAllowedState::ALLOWED);
   assistant_state()->NotifyStatusChanged(
-      chromeos::assistant::AssistantStatus::NEW_READY);
+      chromeos::assistant::AssistantStatus::READY);
 
   ShelfNavigationWidget::TestApi test_api(
       GetPrimaryShelf()->navigation_widget());
@@ -568,7 +568,7 @@ TEST_P(HomeButtonTest, LongPressGestureInTabletMode) {
   assistant_state()->NotifyFeatureAllowed(
       chromeos::assistant::AssistantAllowedState::ALLOWED);
   assistant_state()->NotifyStatusChanged(
-      chromeos::assistant::AssistantStatus::NEW_READY);
+      chromeos::assistant::AssistantStatus::READY);
 
   Shell::Get()->tablet_mode_controller()->SetEnabledForTest(true);
 

ash/shelf/hotseat_widget_unittest.cc

@@ -101,7 +101,7 @@ class HotseatWidgetTest
       assistant_test_api_->GetAssistantState()->NotifyFeatureAllowed(
           chromeos::assistant::AssistantAllowedState::ALLOWED);
       assistant_test_api_->GetAssistantState()->NotifyStatusChanged(
-          chromeos::assistant::AssistantStatus::NEW_READY);
+          chromeos::assistant::AssistantStatus::READY);
 
       assistant_test_api_->WaitUntilIdle();
     }

ash/system/palette/palette_tray_unittest.cc

@@ -342,7 +342,7 @@ TEST_F(PaletteTrayTestWithAssistant, MetalayerToolActivatesHighlighter) {
   assistant_state()->NotifyFeatureAllowed(
       chromeos::assistant::AssistantAllowedState::ALLOWED);
   assistant_state()->NotifyStatusChanged(
-      chromeos::assistant::AssistantStatus::NEW_READY);
+      chromeos::assistant::AssistantStatus::READY);
   prefs()->SetBoolean(chromeos::assistant::prefs::kAssistantEnabled, true);
   prefs()->SetBoolean(chromeos::assistant::prefs::kAssistantContextEnabled,
                       true);
@@ -459,7 +459,7 @@ TEST_F(PaletteTrayTestWithAssistant, StylusBarrelButtonActivatesHighlighter) {
 
   // Once the service is ready, the button should start working.
   assistant_state()->NotifyStatusChanged(
-      chromeos::assistant::AssistantStatus::NEW_READY);
+      chromeos::assistant::AssistantStatus::READY);
 
   // Press and drag with no button, still no highlighter.
   WaitDragAndAssertMetalayer("all enabled, no button ", origin, ui::EF_NONE,

ash/system/palette/tools/metalayer_unittest.cc

@@ -72,7 +72,7 @@ class MetalayerToolTest : public AshTestBase {
 TEST_F(MetalayerToolTest, PaletteMenuState) {
   const chromeos::assistant::AssistantStatus kStates[] = {
       chromeos::assistant::AssistantStatus::NOT_READY,
-      chromeos::assistant::AssistantStatus::NEW_READY};
+      chromeos::assistant::AssistantStatus::READY};
   const chromeos::assistant::AssistantAllowedState kAllowedStates[] = {
       chromeos::assistant::AssistantAllowedState::ALLOWED,
       chromeos::assistant::AssistantAllowedState::DISALLOWED_BY_POLICY,
@@ -177,7 +177,7 @@ TEST_F(MetalayerToolTest, MetalayerUnsupportedDisablesPaletteTool) {
               DisableTool(PaletteToolId::METALAYER))
       .Times(0);
   assistant_state()->NotifyStatusChanged(
-      chromeos::assistant::AssistantStatus::NEW_READY);
+      chromeos::assistant::AssistantStatus::READY);
   testing::Mock::VerifyAndClearExpectations(palette_tool_delegate_.get());
 
   // Changing the state to NOT_READY should disable the tool.

chrome/browser/chromeos/extensions/autotest_private/autotest_private_api.cc

@@ -2449,7 +2449,7 @@ void AutotestPrivateEnableAssistantAndWaitForReadyFunction::
 
 void AutotestPrivateEnableAssistantAndWaitForReadyFunction::
     OnAssistantStatusChanged(chromeos::assistant::AssistantStatus status) {
-  if (status == chromeos::assistant::AssistantStatus::NEW_READY) {
+  if (status == chromeos::assistant::AssistantStatus::READY) {
     Respond(NoArguments());
     self_.reset();
   }

chrome/browser/chromeos/login/screens/assistant_optin_flow_screen_browsertest.cc

@@ -443,7 +443,7 @@ IN_PROC_BROWSER_TEST_F(AssistantOptInFlowTest, Basic) {
   auto force_lib_assistant_enabled =
       AssistantOptInFlowScreen::ForceLibAssistantEnabledForTesting(true);
   ash::AssistantState::Get()->NotifyStatusChanged(
-      chromeos::assistant::AssistantStatus::NEW_READY);
+      chromeos::assistant::AssistantStatus::READY);
 
   SetUpAssistantScreensForTest();
   ShowAssistantOptInFlowScreen();
@@ -486,7 +486,7 @@ IN_PROC_BROWSER_TEST_F(AssistantOptInFlowTest, DisableScreenContext) {
   auto force_lib_assistant_enabled =
       AssistantOptInFlowScreen::ForceLibAssistantEnabledForTesting(true);
   ash::AssistantState::Get()->NotifyStatusChanged(
-      chromeos::assistant::AssistantStatus::NEW_READY);
+      chromeos::assistant::AssistantStatus::READY);
 
   SetUpAssistantScreensForTest();
   ShowAssistantOptInFlowScreen();
@@ -540,7 +540,7 @@ IN_PROC_BROWSER_TEST_F(AssistantOptInFlowTest, AssistantStateUpdateAfterShow) {
   screen_waiter.Wait();
 
   ash::AssistantState::Get()->NotifyStatusChanged(
-      chromeos::assistant::AssistantStatus::NEW_READY);
+      chromeos::assistant::AssistantStatus::READY);
 
   WaitForAssistantScreen("value-prop");
   TapWhenEnabled({"assistant-optin-flow-card", "value-prop", "next-button"});
@@ -578,7 +578,7 @@ IN_PROC_BROWSER_TEST_F(AssistantOptInFlowTest, RetryOnWebviewLoadFail) {
   ShowAssistantOptInFlowScreen();
 
   ash::AssistantState::Get()->NotifyStatusChanged(
-      chromeos::assistant::AssistantStatus::NEW_READY);
+      chromeos::assistant::AssistantStatus::READY);
 
   OobeScreenWaiter screen_waiter(AssistantOptInFlowScreenView::kScreenId);
   screen_waiter.set_assert_next_screen();
@@ -621,7 +621,7 @@ IN_PROC_BROWSER_TEST_F(AssistantOptInFlowTest, RejectValueProp) {
       AssistantOptInFlowScreen::ForceLibAssistantEnabledForTesting(true);
   SetUpAssistantScreensForTest();
   ash::AssistantState::Get()->NotifyStatusChanged(
-      chromeos::assistant::AssistantStatus::NEW_READY);
+      chromeos::assistant::AssistantStatus::READY);
 
   ShowAssistantOptInFlowScreen();
 
@@ -653,7 +653,7 @@ IN_PROC_BROWSER_TEST_F(AssistantOptInFlowTest, AskEmailOptIn_NotChecked) {
   assistant_settings_->set_consent_ui_flags(
       ScopedAssistantSettings::CONSENT_UI_FLAG_ASK_EMAIL_OPT_IN);
   ash::AssistantState::Get()->NotifyStatusChanged(
-      chromeos::assistant::AssistantStatus::NEW_READY);
+      chromeos::assistant::AssistantStatus::READY);
 
   SetUpAssistantScreensForTest();
   ShowAssistantOptInFlowScreen();
@@ -701,7 +701,7 @@ IN_PROC_BROWSER_TEST_F(AssistantOptInFlowTest, AskEmailOptIn_Accepted) {
   assistant_settings_->set_consent_ui_flags(
       ScopedAssistantSettings::CONSENT_UI_FLAG_ASK_EMAIL_OPT_IN);
   ash::AssistantState::Get()->NotifyStatusChanged(
-      chromeos::assistant::AssistantStatus::NEW_READY);
+      chromeos::assistant::AssistantStatus::READY);
 
   SetUpAssistantScreensForTest();
   ShowAssistantOptInFlowScreen();
@@ -754,7 +754,7 @@ IN_PROC_BROWSER_TEST_F(AssistantOptInFlowTest, SkipShowingValueProp) {
 
   SetUpAssistantScreensForTest();
   ash::AssistantState::Get()->NotifyStatusChanged(
-      chromeos::assistant::AssistantStatus::NEW_READY);
+      chromeos::assistant::AssistantStatus::READY);
 
   ShowAssistantOptInFlowScreen();
 
@@ -796,7 +796,7 @@ IN_PROC_BROWSER_TEST_F(AssistantOptInFlowTest,
 
   SetUpAssistantScreensForTest();
   ash::AssistantState::Get()->NotifyStatusChanged(
-      chromeos::assistant::AssistantStatus::NEW_READY);
+      chromeos::assistant::AssistantStatus::READY);
 
   ShowAssistantOptInFlowScreen();
 
@@ -836,7 +836,7 @@ IN_PROC_BROWSER_TEST_F(AssistantOptInFlowTest, SpeakerIdEnrollment) {
 
   SetUpAssistantScreensForTest();
   ash::AssistantState::Get()->NotifyStatusChanged(
-      chromeos::assistant::AssistantStatus::NEW_READY);
+      chromeos::assistant::AssistantStatus::READY);
 
   ShowAssistantOptInFlowScreen();
 
@@ -925,7 +925,7 @@ IN_PROC_BROWSER_TEST_F(AssistantOptInFlowTest,
 
   SetUpAssistantScreensForTest();
   ash::AssistantState::Get()->NotifyStatusChanged(
-      chromeos::assistant::AssistantStatus::NEW_READY);
+      chromeos::assistant::AssistantStatus::READY);
 
   ShowAssistantOptInFlowScreen();
 
@@ -981,7 +981,7 @@ IN_PROC_BROWSER_TEST_F(AssistantOptInFlowTest,
 
   SetUpAssistantScreensForTest();
   ash::AssistantState::Get()->NotifyStatusChanged(
-      chromeos::assistant::AssistantStatus::NEW_READY);
+      chromeos::assistant::AssistantStatus::READY);
 
   ShowAssistantOptInFlowScreen();
 
@@ -1037,7 +1037,7 @@ IN_PROC_BROWSER_TEST_F(AssistantOptInFlowTest, WAADisabledByPolicy) {
       ScopedAssistantSettings::CONSENT_UI_FLAG_WAA_DISABLED_BY_POLICY);
 
   ash::AssistantState::Get()->NotifyStatusChanged(
-      chromeos::assistant::AssistantStatus::NEW_READY);
+      chromeos::assistant::AssistantStatus::READY);
   SetUpAssistantScreensForTest();
   ShowAssistantOptInFlowScreen();
 
@@ -1062,7 +1062,7 @@ IN_PROC_BROWSER_TEST_F(AssistantOptInFlowTest, AssistantDisabledByPolicy) {
       ScopedAssistantSettings::CONSENT_UI_FLAG_ASSISTANT_DISABLED_BY_POLICY);
 
   ash::AssistantState::Get()->NotifyStatusChanged(
-      chromeos::assistant::AssistantStatus::NEW_READY);
+      chromeos::assistant::AssistantStatus::READY);
   SetUpAssistantScreensForTest();
   ShowAssistantOptInFlowScreen();
 
@@ -1085,7 +1085,7 @@ IN_PROC_BROWSER_TEST_F(AssistantOptInFlowTest, AssistantSkippedNoLib) {
   auto force_lib_assistant_disabled =
       AssistantOptInFlowScreen::ForceLibAssistantEnabledForTesting(false);
   ash::AssistantState::Get()->NotifyStatusChanged(
-      chromeos::assistant::AssistantStatus::NEW_READY);
+      chromeos::assistant::AssistantStatus::READY);
   SetUpAssistantScreensForTest();
   ShowAssistantOptInFlowScreen();
 

chrome/browser/ui/ash/assistant/assistant_test_mixin.cc

@@ -398,7 +398,7 @@ void AssistantTestMixin::StartAssistantAndWaitForReady(
   SetPreferVoice(false);
 
   AssistantStatusWaiter waiter(test_api_->GetAssistantState(),
-                               chromeos::assistant::AssistantStatus::NEW_READY);
+                               chromeos::assistant::AssistantStatus::READY);
   waiter.RunUntilExpectedStatus();
 
   // With the warmer welcome enabled the Assistant service will start an

chromeos/services/assistant/public/cpp/assistant_enums.h

@@ -14,11 +14,7 @@ enum AssistantStatus {
   // The Assistant service is not ready yet.
   NOT_READY = 0,
   // The Assistant service is ready.
-  // TODO(b/142428671): This is set when the Assistant backend signals it is
-  // ready to handle queries, where |READY| is signaled when it is started.
-  // If this signal turns out to be reliable it should replace |READY| and be
-  // renamed to |READY|.
-  NEW_READY,
+  READY,
 };
 
 enum AssistantAllowedState {

chromeos/services/assistant/service.cc

@@ -83,7 +83,7 @@ AssistantStatus ToAssistantStatus(AssistantManagerService::State state) {
     case State::STARTED:
       return AssistantStatus::NOT_READY;
     case State::RUNNING:
-      return AssistantStatus::NEW_READY;
+      return AssistantStatus::READY;
   }
 }
 

chromeos/services/assistant/service_unittest.cc

@@ -306,7 +306,7 @@ TEST_F(AssistantServiceTest, ShouldSetClientStatusToNewReadyWhenRunning) {
       AssistantManagerService::State::RUNNING);
   base::RunLoop().RunUntilIdle();
 
-  EXPECT_EQ(client()->status(), AssistantStatus::NEW_READY);
+  EXPECT_EQ(client()->status(), AssistantStatus::READY);
 }
 
 TEST_F(AssistantServiceTest, ShouldSetClientStatusToNotReadyWhenStopped) {