Enable Assistant timers v2 by default.

This will enable the new Assistant timers experience by default which
adds system notifications for the entire lifetime of a timer.

Bug: b:149570650
Change-Id: Id3f6675bdc020b56d21f1cd7418ed287aa0d979f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2439424
Commit-Queue: David Black <dmblack@google.com>
Reviewed-by: Xiaohui Chen <xiaohuic@chromium.org>
Cr-Commit-Position: refs/heads/master@{#812085}

chromeos/services/assistant/assistant_manager_service_impl_unittest.cc

@@ -43,6 +43,7 @@ namespace assistant {
 using media_session::mojom::MediaSessionAction;
 using testing::ElementsAre;
 using testing::Invoke;
+using testing::NiceMock;
 using testing::StrictMock;
 using CommunicationErrorType = AssistantManagerService::CommunicationErrorType;
 using UserInfo = AssistantManagerService::UserInfo;
@@ -321,6 +322,10 @@ TEST_F(AssistantManagerServiceImplTest,
 
 TEST_F(AssistantManagerServiceImplTest,
        StateShouldBecomeRunningAfterLibassistantSignalsOnStartFinished) {
+  NiceMock<AssistantAlarmTimerControllerMock> alarm_timer_controller;
+  fake_service_context()->set_assistant_alarm_timer_controller(
+      &alarm_timer_controller);
+
   Start();
   WaitUntilStartIsFinished();
 
@@ -505,6 +510,10 @@ TEST_F(AssistantManagerServiceImplTest, ShouldFireStateObserverWhenStarted) {
 
 TEST_F(AssistantManagerServiceImplTest,
        ShouldFireStateObserverWhenLibAssistantSignalsOnStartFinished) {
+  NiceMock<AssistantAlarmTimerControllerMock> alarm_timer_controller;
+  fake_service_context()->set_assistant_alarm_timer_controller(
+      &alarm_timer_controller);
+
   Start();
   WaitUntilStartIsFinished();
 
@@ -555,7 +564,10 @@ TEST_F(AssistantManagerServiceImplTest,
 }
 
 TEST_F(AssistantManagerServiceImplTest,
-       ShouldNotifyAlarmTimerControllerOfOnlyRingingTimers) {
+       ShouldNotifyAlarmTimerControllerOfOnlyRingingTimersInV1) {
+  base::test::ScopedFeatureList scoped_feature_list;
+  scoped_feature_list.InitAndDisableFeature(features::kAssistantTimersV2);
+
   Start();
   WaitUntilStartIsFinished();
   assistant_manager_service()->OnStartFinished();

chromeos/services/assistant/public/cpp/features.cc

@@ -36,7 +36,7 @@ const base::Feature kAssistantRoutines{"AssistantRoutines",
                                        base::FEATURE_DISABLED_BY_DEFAULT};
 
 const base::Feature kAssistantTimersV2{"AssistantTimersV2",
-                                       base::FEATURE_DISABLED_BY_DEFAULT};
+                                       base::FEATURE_ENABLED_BY_DEFAULT};
 
 const base::Feature kAssistantWaitScheduling{"AssistantWaitScheduling",
                                              base::FEATURE_ENABLED_BY_DEFAULT};