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

4 files changed, 3 insertions, 58 deletions

diff --git a/chrome/test/functional/chromeos_device_policy.py b/chrome/test/functional/chromeos_device_policy.py
index d32d0c4..99d415b 100644
--- a/chrome/test/functional/chromeos_device_policy.py
+++ b/chrome/test/functional/chromeos_device_policy.py
@@ -187,37 +187,6 @@ class ChromeosDevicePolicy(policy_base.PolicyTestBase):
     self._WaitForPodVisibility(username=self._usernames[0], visible=True)
     self._WaitForPodVisibility(username=self._usernames[1], visible=True)
 
-  _timezones = ['America/Barbados', 'Europe/Helsinki']
-
-  def testTimezoneSettingWithoutPolicy(self):
-    """Without timezone policy, timezone changes by user are persistent."""
-    self.SetDevicePolicy(refresh=False)
-
-    for timezone in self._timezones:
-      self.Login(user_index=1, expect_success=True)
-      self.SetTimezone(timezone)
-      self.assertEqual(timezone, self.GetTimeInfo()['timezone'])
-
-      self.Logout()
-      self.assertEqual(timezone, self.GetTimeInfo()['timezone'])
-
-  def testTimezoneSettingWithPolicy(self):
-    """With timezone policy, timezone changes by user are reset on logout."""
-    self.SetDevicePolicy({'timezone':self._timezones[0]}, refresh=True)
-
-    # Timezones are set on startup, i.e. everytime when loading the login
-    # screen. Something like a browser restart may work, too.
-    self.Login(user_index=1, expect_success=True)
-    self.Logout()
-
-    self.assertEqual(self._timezones[0], self.GetTimeInfo()['timezone'])
-
-    self.Login(user_index=1, expect_success=True)
-    self.SetTimezone(self._timezones[1])
-    self.assertEqual(self._timezones[1], self.GetTimeInfo()['timezone'])
-
-    self.Logout()
-    self.assertEqual(self._timezones[0], self.GetTimeInfo()['timezone'])
 
 if __name__ == '__main__':
   pyauto_functional.Main()
diff --git a/chrome/test/functional/chromeos_time.py b/chrome/test/functional/chromeos_time.py
index 644961c..8cb99ca 100755
--- a/chrome/test/functional/chromeos_time.py
+++ b/chrome/test/functional/chromeos_time.py
@@ -68,28 +68,6 @@ class ChromeosTime(pyauto.PyUITest):
     editable = self._IsTimezoneEditable()
     self.assertTrue(editable, msg='Timezone is not editable when not owner.')
 
-  def _SetTimezoneInUI(self, timezone):
-    self.NavigateToURL('chrome://settings-frame/settings')
-    self.ExecuteJavascript("""
-        var selectElement = document.getElementById('timezone-select');
-        selectElement.value = "%s";
-        var event = document.createEvent("HTMLEvents");
-        event.initEvent("change", true, true);
-        selectElement.dispatchEvent(event);
-        domAutomationController.send("");
-    """ % timezone)
-
-  def testSetTimezoneUI(self):
-    """Test that the timezone UI changes internal settings.
-
-    Set the Timezone on the settings page. Check the internal timezone
-    afterwards. Timezones should be always editable."""
-
-    for timezone in ['America/Barbados', 'Europe/Helsinki']:
-      self._SetTimezoneInUI(timezone)
-      self.assertTrue(
-          self.WaitUntil(lambda: timezone == self.GetTimeInfo()['timezone']),
-          'Timezone not changed as expected.');
 
 if __name__ == '__main__':
   pyauto_functional.Main()
diff --git a/chrome/test/functional/policy_test_cases.py b/chrome/test/functional/policy_test_cases.py
index b21d2d5..3713e60 100755
--- a/chrome/test/functional/policy_test_cases.py
+++ b/chrome/test/functional/policy_test_cases.py
@@ -296,7 +296,6 @@ class PolicyPrefsTestCases(object):
     'DeviceUpdateScatterFactor': (None, '7200', [], ['chromeos']),
     'DeviceUpdateAllowedConnectionTypes': (None, [], [], ['chromeos']),
     'ReportDeviceLocation': (None, False, [], ['chromeos']),
-    'DeviceTimezone': (None, 'Europe/Brussels', [], ['chromeos']),
 
     # Chrome Frame policies:
     'ChromeFrameRendererSettings': (None, 0, [], []),
diff --git a/chrome/test/pyautolib/pyauto.py b/chrome/test/pyautolib/pyauto.py
index 1d8ed46..7ef8b95 100755
--- a/chrome/test/pyautolib/pyauto.py
+++ b/chrome/test/pyautolib/pyauto.py
@@ -5713,12 +5713,11 @@ class PyUITest(pyautolib.PyUITestBase, unittest.TestCase):
     """Sets the timezone on ChromeOS. A user must be logged in.
 
     The timezone is the relative path to the timezone file in
-    /usr/share/zoneinfo. For example, /usr/share/zoneinfo/America/Los_Angeles is
-    'America/Los_Angeles'. For a list of valid timezones see
-    'chrome/browser/chromeos/system/timezone_settings.cc'.
+    /usr/share/zoneinfo. For example, /usr/share/zoneinfo/America/Los_Angeles
+    is 'America/Los_Angeles'.
 
     This method does not return indication of success or failure.
-    If the timezone is it falls back to a valid timezone.
+    If the timezone is invalid, it falls back to UTC/GMT.
 
     Raises:
       pyauto_errors.JSONInterfaceError if the automation call returns an error.