Revert r150536 - "Added a timezone policy and pyauto tests for it."

chrome/browser/chromeos/settings/device_settings_provider.cc

 // Copyright (c) 2012 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/settings/device_settings_provider.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/file_util.h"
@@ skipping 43 matching lines @@
   kReportDeviceActivityTimes,
   kReportDeviceBootMode,
   kReportDeviceLocation,
   kReportDeviceVersionInfo,
   kScreenSaverExtensionId,
   kScreenSaverTimeout,
   kSettingProxyEverywhere,
   kSignedDataRoamingEnabled,
   kStartUpUrls,
   kStatsReportingPref,
-  kSystemTimezonePolicy,
 };
 
 // Upper bound for number of retries to fetch a signed setting.
 static const int kNumRetriesLimit = 9;
 
 // Legacy policy file location. Used to detect migration from pre v12 ChromeOS.
 const char kLegacyPolicyFile[] = "/var/lib/whitelist/preferences";
 
 bool IsControlledSetting(const std::string& pref_path) {
   const char** end = kKnownSettings + arraysize(kKnownSettings);
@@ skipping 217 matching lines @@
     //   kIdleLogoutTimeout
     //   kIdleLogoutWarningDuration
     //   kReleaseChannelDelegated
     //   kReportDeviceVersionInfo
     //   kReportDeviceActivityTimes
     //   kReportDeviceBootMode
     //   kReportDeviceLocation
     //   kScreenSaverExtensionId
     //   kScreenSaverTimeout
     //   kStartUpUrls
-    //   kSystemTimezonePolicy
 
     NOTREACHED();
   }
   data.set_policy_value(pol.SerializeAsString());
   // Set the cache to the updated value.
   policy_ = data;
   UpdateValuesCache();
 
   if (!signed_settings_cache::Store(data, g_browser_process->local_state()))
     LOG(ERROR) << "Couldn't store to the temp storage.";
@@ skipping 208 matching lines @@
   } else {
     new_values_cache->SetString(kReleaseChannel,
                                 policy.release_channel().release_channel());
   }
 
   new_values_cache->SetBoolean(
       kReleaseChannelDelegated,
       policy.has_release_channel() &&
       policy.release_channel().has_release_channel_delegated() &&
       policy.release_channel().release_channel_delegated());
-
-  if (policy.has_system_timezone()) {
-    if (policy.system_timezone().has_timezone()) {
-      new_values_cache->SetString(
-          kSystemTimezonePolicy,
-          policy.system_timezone().timezone());
-    }
-  }
 }
 
 void DeviceSettingsProvider::UpdateValuesCache() {
   const em::PolicyData data = policy();
   PrefValueMap new_values_cache;
 
   if (data.has_username() && !data.has_request_token())
     new_values_cache.SetString(kDeviceOwner, data.username());
 
   em::ChromeDeviceSettingsProto pol;
@@ skipping 200 matching lines @@
     }
   }
   // Notify the observers we are done.
   std::vector<base::Closure> callbacks;
   callbacks.swap(callbacks_);
   for (size_t i = 0; i < callbacks.size(); ++i)
     callbacks[i].Run();
 }
 
 }  // namespace chromeos