ChromeOS: Refactor TimeZoneResolver, add TimeZoneResolverManager.

chromeos/timezone/timezone_resolver.cc

 // Copyright 2014 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 "chromeos/timezone/timezone_resolver.h"
 
 #include <math.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 100 matching lines @@
   void RequestIsFinished();
 
   void ApplyTimeZone(const TimeZoneResponseData* timezone);
 
   TimeZoneResolver::DelayNetworkCallClosure delay_network_call() const {
     return resolver_->delay_network_call();
   }
 
   base::WeakPtr<TimeZoneResolver::TimeZoneResolverImpl> AsWeakPtr();
 
+  bool ShouldSendWiFiGeolocationData();
+
  private:
   const TimeZoneResolver* resolver_;
 
   // Returns delay to next timezone update request
   base::TimeDelta CalculateNextInterval();
 
   SimpleGeolocationProvider geolocation_provider_;
   TimeZoneProvider timezone_provider_;
 
   base::OneShotTimer refresh_timer_;
@@ skipping 45 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(TZRequest);
 };
 
 TZRequest::~TZRequest() {
 }
 
 void TZRequest::StartRequestOnNetworkAvailable() {
   resolver_->RecordAttempt();
   resolver_->geolocation_provider()->RequestGeolocation(
       base::TimeDelta::FromSeconds(kRefreshTimeZoneTimeoutSeconds),
-      false /* send_wifi_geolocation_data */,
+      resolver_->ShouldSendWiFiGeolocationData(),
       base::Bind(&TZRequest::OnLocationResolved, AsWeakPtr()));
 }
 
 void TZRequest::Start() {
   // call to chromeos::DelayNetworkCall
   resolver_->delay_network_call().Run(
       base::Bind(&TZRequest::StartRequestOnNetworkAvailable, AsWeakPtr()));
 }
 
 void TZRequest::OnLocationResolved(const Geoposition& position,
@@ skipping 162 matching lines @@
 void TimeZoneResolver::TimeZoneResolverImpl::RequestIsFinished() {
   request_.reset();
   ScheduleRequest();
 }
 
 void TimeZoneResolver::TimeZoneResolverImpl::ApplyTimeZone(
     const TimeZoneResponseData* timezone) {
   resolver_->apply_timezone().Run(timezone);
 }
 
+bool TimeZoneResolver::TimeZoneResolverImpl::ShouldSendWiFiGeolocationData() {
+  return resolver_->ShouldSendWiFiGeolocationData();
+}
+
 base::WeakPtr<TimeZoneResolver::TimeZoneResolverImpl>
 TimeZoneResolver::TimeZoneResolverImpl::AsWeakPtr() {
   return weak_ptr_factory_.GetWeakPtr();
 }
 
 // ------------------------------------------------------------------------
+// TimeZoneResolver::Delegate implementation
+TimeZoneResolver::Delegate::Delegate() {}
+TimeZoneResolver::Delegate::~Delegate() {}
+
+// ------------------------------------------------------------------------
 // TimeZoneResolver implementation
 
 TimeZoneResolver::TimeZoneResolver(
+    Delegate* delegate,
     scoped_refptr<net::URLRequestContextGetter> context,
     const GURL& url,
     const ApplyTimeZoneCallback& apply_timezone,
     const DelayNetworkCallClosure& delay_network_call,
     PrefService* local_state)
-    : context_(context),
+    : delegate_(delegate),
+      context_(context),
       url_(url),
       apply_timezone_(apply_timezone),
       delay_network_call_(delay_network_call),
       local_state_(local_state),
       send_wifi_data_to_geolocation_api_(false) {
   DCHECK(!apply_timezone.is_null());
 }
 
 TimeZoneResolver::~TimeZoneResolver() {
   Stop();
@@ skipping 21 matching lines @@
 // static
 int TimeZoneResolver::IntervalForNextRequestForTesting(const int requests) {
   return IntervalForNextRequest(requests);
 }
 
 // static
 void TimeZoneResolver::RegisterPrefs(PrefRegistrySimple* registry) {
   registry->RegisterInt64Pref(kLastTimeZoneRefreshTime, 0);
 }
 
+bool TimeZoneResolver::ShouldSendWiFiGeolocationData() const {
+  DCHECK(delegate_);

[stevenjb, 2016/03/29 02:15:55]

nit: move DCHECK to the constructor where it is set.

[Alexander Alekseev, 2016/03/29 03:46:35]

Done.

+  return delegate_->ShouldSendWiFiGeolocationData();
+}
+
 }  // namespace chromeos