ChromeOS: Correctly handle settings.resolve_device_timezone_by_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 80 matching lines @@
   const bool value =
       user_prefs->GetBoolean(prefs::kResolveTimezoneByGeolocation);
   if (value)
     return SHOULD_START;
 
   return SHOULD_STOP;
 }
 
 // Returns service configuration for the signin screen.
 ServiceConfiguration GetServiceConfigurationForSigninScreen() {
-  if (!g_browser_process->local_state()->GetBoolean(
-          prefs::kResolveDeviceTimezoneByGeolocation)) {
+  const PrefService::Preference* device_pref =
+      g_browser_process->local_state()->FindPreference(
+          prefs::kResolveDeviceTimezoneByGeolocation);
+  bool device_pref_value;
+  if (!device_pref ||
+      !device_pref->GetValue()->GetAsBoolean(&device_pref_value)) {
     // CfM devices default to static timezone.
     bool keyboard_driven_oobe =
         system::InputDeviceSettings::Get()->ForceKeyboardDrivenUINavigation();
     return keyboard_driven_oobe ? SHOULD_STOP : SHOULD_START;
   }
 
   // Do not start resolver if we are inside active user session.
   // If user preferences permit, it will be started on preferences
   // initialization.
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kLoginUser))
     return SHOULD_STOP;
 
-  return SHOULD_START;
+  return device_pref_value ? SHOULD_START : SHOULD_STOP;
 }
 
 }  // anonymous namespace.
 
 TimeZoneResolverManager::TimeZoneResolverManager()
     : primary_user_prefs_(nullptr) {
   local_state_pref_change_registrar_.Init(g_browser_process->local_state());
   local_state_pref_change_registrar_.Add(
       prefs::kSystemTimezoneAutomaticDetectionPolicy,
       base::Bind(
@@ skipping 61 matching lines @@
     } else {
       // We are on a signin page.
       result = GetServiceConfigurationForSigninScreen();
     }
   }
   return result == SHOULD_START;
 }
 
 }  // namespace system
 }  // namespace chromeos