[Night Light] CL12: String changes and fix frequent requests.

chrome/browser/chromeos/night_light/night_light_client.cc

Index: chrome/browser/chromeos/night_light/night_light_client.cc
diff --git a/chrome/browser/chromeos/night_light/night_light_client.cc b/chrome/browser/chromeos/night_light/night_light_client.cc
index 0b8941ba207973398bb177a215c7ea42d0f3b938..78d304fc5945025f3d721830e42c06411a930757 100644
--- a/chrome/browser/chromeos/night_light/night_light_client.cc
+++ b/chrome/browser/chromeos/night_light/night_light_client.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/chromeos/night_light/night_light_client.h"
 
+#include <algorithm>
+
 #include "ash/public/interfaces/constants.mojom.h"
 #include "content/public/common/service_manager_connection.h"
 #include "services/service_manager/public/cpp/connector.h"
@@ -51,15 +53,32 @@ void NightLightClient::OnScheduleTypeChanged(
     ash::mojom::NightLightController::ScheduleType new_type) {
   if (new_type ==
       ash::mojom::NightLightController::ScheduleType::kSunsetToSunrise) {
-    // Schedule an immediate request.
     using_geoposition_ = true;
-    ScheduleNextRequest(base::TimeDelta::FromSeconds(0));
+    // No need to request a new position if we already have a valid one from a
+    // request less than kNextRequestDelayAfterSuccess ago.
+    base::Time now = base::Time::Now();
+    if ((now - last_successful_geo_request_time_) <
+        kNextRequestDelayAfterSuccess) {
+      // Use the current valid position to update NightLightController.
+      SendCurrentGeoposition();
+    }
+
+    // Next request is either immediate or kNextRequestDelayAfterSuccess later
+    // than the last success time, whichever is greater.
+    ScheduleNextRequest(std::max(base::TimeDelta::FromSeconds(0),
+                                 last_successful_geo_request_time_ +
+                                     kNextRequestDelayAfterSuccess - now));
   } else {
     using_geoposition_ = false;
     timer_.Stop();
   }
 }
 
+// static
+base::TimeDelta NightLightClient::GetNextRequestDelayAfterSuccessForTesting() {
+  return kNextRequestDelayAfterSuccess;
+}
+
 void NightLightClient::SetNightLightControllerPtrForTesting(
     ash::mojom::NightLightControllerPtr controller) {
   night_light_controller_ = std::move(controller);
@@ -90,9 +109,11 @@ void NightLightClient::OnGeoposition(const chromeos::Geoposition& position,
     return;
   }
 
-  night_light_controller_->SetCurrentGeoposition(
-      ash::mojom::SimpleGeoposition::New(position.latitude,
-                                         position.longitude));
+  last_successful_geo_request_time_ = base::Time::Now();
+
+  latitude_ = position.latitude;
+  longitude_ = position.longitude;
+  SendCurrentGeoposition();
 
   // On success, reset the backoff delay to its minimum value, and schedule
   // another request.
@@ -100,6 +121,11 @@ void NightLightClient::OnGeoposition(const chromeos::Geoposition& position,
   ScheduleNextRequest(kNextRequestDelayAfterSuccess);
 }
 
+void NightLightClient::SendCurrentGeoposition() {
+  night_light_controller_->SetCurrentGeoposition(
+      ash::mojom::SimpleGeoposition::New(latitude_, longitude_));
+}
+
 void NightLightClient::ScheduleNextRequest(base::TimeDelta delay) {
   timer_.Start(FROM_HERE, delay, this, &NightLightClient::RequestGeoposition);
 }