Add support for cellular geolocation

chrome/browser/chromeos/system/timezone_resolver_manager.cc

 // Copyright 2016 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 "chrome/browser/chromeos/system/timezone_resolver_manager.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h"
@@ skipping 36 matching lines @@
 
   switch (policy_value) {
     case enterprise_management::SystemTimezoneProto::USERS_DECIDE:
       return UNSPECIFIED;
     case enterprise_management::SystemTimezoneProto::DISABLED:
       return SHOULD_STOP;
     case enterprise_management::SystemTimezoneProto::IP_ONLY:
       return SHOULD_START;
     case enterprise_management::SystemTimezoneProto::SEND_WIFI_ACCESS_POINTS:
       return SHOULD_START;
+    case enterprise_management::SystemTimezoneProto::SEND_ALL_LOCATION_INFO:
+      return SHOULD_START;
   }
   // Default for unknown policy value.
   NOTREACHED() << "Unrecognized policy value: " << policy_value;
   return SHOULD_STOP;
 }
 
 // Stops TimezoneResolver if SystemTimezonePolicy is applied.
 // Returns SHOULD_* if timezone resolver status is controlled by this policy.
 ServiceConfiguration GetServiceConfigurationFromSystemTimezonePolicy() {
   if (!HasSystemTimezonePolicy())
@@ skipping 54 matching lines @@
           base::Unretained(this)));
 }
 
 TimeZoneResolverManager::~TimeZoneResolverManager() {}
 
 void TimeZoneResolverManager::SetPrimaryUserPrefs(PrefService* pref_service) {
   primary_user_prefs_ = pref_service;
 }
 
 bool TimeZoneResolverManager::ShouldSendWiFiGeolocationData() {
+  return (
+      (GetTimezoneManagementSetting() ==
+       enterprise_management::SystemTimezoneProto::SEND_WIFI_ACCESS_POINTS) ||
+      (GetTimezoneManagementSetting() ==
+       enterprise_management::SystemTimezoneProto::SEND_ALL_LOCATION_INFO));

[stevenjb, 2017/02/09 20:12:52]

This still calls GetTimezoneManagementSetting() twice. You need a local here.

[can Skylar cook, 2017/02/09 21:10:45]

D'oh

+}
+
+bool TimeZoneResolverManager::ShouldSendCellularGeolocationData() {
+  return (GetTimezoneManagementSetting() ==
+          enterprise_management::SystemTimezoneProto::SEND_ALL_LOCATION_INFO);
+}
+
+int TimeZoneResolverManager::GetTimezoneManagementSetting() {
   PrefService* local_state = g_browser_process->local_state();
   const bool is_managed = local_state->IsManagedPreference(
       prefs::kSystemTimezoneAutomaticDetectionPolicy);
   if (!is_managed)
     return false;
 
   int policy_value =
       local_state->GetInteger(prefs::kSystemTimezoneAutomaticDetectionPolicy);
 
   DCHECK(policy_value <= enterprise_management::SystemTimezoneProto::
                              AutomaticTimezoneDetectionType_MAX);
 
-  return policy_value ==
-         enterprise_management::SystemTimezoneProto::SEND_WIFI_ACCESS_POINTS;
+  return policy_value;
 }
 
 void TimeZoneResolverManager::UpdateTimezoneResolver() {
   if (TimeZoneResolverShouldBeRunning())
     g_browser_process->platform_part()->GetTimezoneResolver()->Start();
   else
     g_browser_process->platform_part()->GetTimezoneResolver()->Stop();
 }
 
 bool TimeZoneResolverManager::ShouldApplyResolvedTimezone() {
@@ skipping 13 matching lines @@
     } else {
       // We are on a signin page.
       result = GetServiceConfigurationForSigninScreen();
     }
   }
   return result == SHOULD_START;
 }
 
 }  // namespace system
 }  // namespace chromeos