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

It broke unit tests on Chrome OS.

BUG=None
TBR=pneubeck@chromium.org

Review URL: https://chromiumcodereview.appspot.com/10829235

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150540 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 0 insertions, 16 deletions

diff --git a/chrome/browser/chromeos/settings/cros_settings_names.cc b/chrome/browser/chromeos/settings/cros_settings_names.cc
index 38cf3c9..0cb3aad 100644
--- a/chrome/browser/chromeos/settings/cros_settings_names.cc
+++ b/chrome/browser/chromeos/settings/cros_settings_names.cc
@@ -23,12 +23,7 @@ const char kSettingProxyEverywhere[] = "cros.proxy.everywhere";
 // All cros.signed.* settings are stored in SignedSettings.
 const char kSignedDataRoamingEnabled[] = "cros.signed.data_roaming_enabled";
 
-// The first constant refers to the user setting editable in the UI.  The second
-// refers to the timezone policy. These are currently separated because the
-// policy stack for device settings does not support the required behavior (see
-// the description in policy_templates.json).
 const char kSystemTimezone[] = "cros.system.timezone";
-const char kSystemTimezonePolicy[] = "cros.system.timezone_policy";
 
 const char kDeviceOwner[] = "cros.device.owner";
 
diff --git a/chrome/browser/chromeos/settings/cros_settings_names.h b/chrome/browser/chromeos/settings/cros_settings_names.h
index 349f68a..c75c834a 100644
--- a/chrome/browser/chromeos/settings/cros_settings_names.h
+++ b/chrome/browser/chromeos/settings/cros_settings_names.h
@@ -19,7 +19,6 @@ extern const char kSettingProxyEverywhere[];
 
 extern const char kSignedDataRoamingEnabled[];
 
-extern const char kSystemTimezonePolicy[];
 extern const char kSystemTimezone[];
 
 extern const char kDeviceOwner[];
diff --git a/chrome/browser/chromeos/settings/device_settings_provider.cc b/chrome/browser/chromeos/settings/device_settings_provider.cc
index b8f0e0e..0c1432e 100644
--- a/chrome/browser/chromeos/settings/device_settings_provider.cc
+++ b/chrome/browser/chromeos/settings/device_settings_provider.cc
@@ -61,7 +61,6 @@ const char* kKnownSettings[] = {
   kSignedDataRoamingEnabled,
   kStartUpUrls,
   kStatsReportingPref,
-  kSystemTimezonePolicy,
 };
 
 // Upper bound for number of retries to fetch a signed setting.
@@ -299,7 +298,6 @@ void DeviceSettingsProvider::SetInPolicy() {
     //   kScreenSaverExtensionId
     //   kScreenSaverTimeout
     //   kStartUpUrls
-    //   kSystemTimezonePolicy
 
     NOTREACHED();
   }
@@ -528,14 +526,6 @@ void DeviceSettingsProvider::DecodeGenericPolicies(
       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() {