[chromeos] Simplify chromeos device policy tests

chrome/test/pyautolib/pyauto.py

 #!/usr/bin/env python
 # 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.
 
 """PyAuto: Python Interface to Chromium's Automation Proxy.
 
 PyAuto uses swig to expose Automation Proxy interfaces to Python.
 For complete documentation on the functionality available,
 run pydoc on this file.
@@ skipping 77 matching lines @@
 from pyauto_errors import NTPThumbnailNotShownError
 import pyauto_utils
 import simplejson as json  # found in third_party
 
 _CHROME_DRIVER_FACTORY = None
 _HTTP_SERVER = None
 _REMOTE_PROXY = None
 _OPTIONS = None
 _BROWSER_PID = None
 
-# TODO(bartfab): Remove when crosbug.com/20709 is fixed.
-AUTO_CLEAR_LOCAL_STATE_MAGIC_FILE = '/root/.forget_usernames'
-
 
 class PyUITest(pyautolib.PyUITestBase, unittest.TestCase):
   """Base class for UI Test Cases in Python.
 
   A browser is created before executing each test, and is destroyed after
   each test irrespective of whether the test passed or failed.
 
   You should derive from this class and create methods with 'test' prefix,
   and use methods inherited from PyUITestBase (the C++ side).
 
@@ skipping 366 matching lines @@
   def CleanupFlimflamDirsOnChromeOS():
     """Clean the contents of flimflam profiles and restart flimflam."""
     PyUITest.RunSuperuserActionOnChromeOS('CleanFlimflamDirs')
 
   @staticmethod
   def RemoveAllCryptohomeVaultsOnChromeOS():
     """Remove any existing cryptohome vaults."""
     PyUITest.RunSuperuserActionOnChromeOS('RemoveAllCryptohomeVaults')
 
   @staticmethod
-  def TryToDisableLocalStateAutoClearingOnChromeOS():
-    """Disable clearing of the local state on session manager startup.
-
-    TODO(bartfab): Remove this method when crosbug.com/20709 is fixed.
-    """
-    PyUITest.RunSuperuserActionOnChromeOS('TryToDisableLocalStateAutoClearing')
-
-  @staticmethod
-  def TryToEnableLocalStateAutoClearingOnChromeOS():
-    """Enable clearing of the local state on session manager startup.
-
-    TODO(bartfab): Remove this method when crosbug.com/20709 is fixed.
-    """
-    PyUITest.RunSuperuserActionOnChromeOS('TryToEnableLocalStateAutoClearing')
-
-  @staticmethod
-  def IsLocalStateAutoClearingEnabledOnChromeOS():
-    """Check if the session manager is set to clear the local state on startup.
-
-    TODO(bartfab): Remove this method when crosbug.com/20709 is fixed.
-    """
-    return os.path.exists(AUTO_CLEAR_LOCAL_STATE_MAGIC_FILE)
-
-  @staticmethod
   def _IsInodeNew(path, old_inode):
     """Determine whether an inode has changed. POSIX only.
 
     Args:
       path: The file path to check for changes.
       old_inode: The old inode number.
 
     Returns:
       True if the path exists and its inode number is different from old_inode.
       False otherwise.
@@ skipping 244 matching lines @@
     Returns:
       A list with the flags.
     """
     return [
       '--sync-url=http://127.0.0.1:%s/chromiumsync' % port,
       '--sync-allow-insecure-xmpp-connection',
       '--sync-notification-host=127.0.0.1:%s' % xmpp_port,
       '--sync-notification-method=p2p',
     ]
 
-  def GetPrivateInfo(self):
+  @staticmethod
+  def GetPrivateInfo():
     """Fetch info from private_tests_info.txt in private dir.
 
     Returns:
       a dictionary of items from private_tests_info.txt
     """
     private_file = os.path.join(
-        self.DataDir(), 'pyauto_private', 'private_tests_info.txt')
+        PyUITest.DataDir(), 'pyauto_private', 'private_tests_info.txt')
     assert os.path.exists(private_file), '%s missing' % private_file
-    return self.EvalDataFrom(private_file)
+    return PyUITest.EvalDataFrom(private_file)
 
   def WaitUntil(self, function, timeout=-1, retry_sleep=0.25, args=[],
                 expect_retval=None, debug=True):
     """Poll on a condition until timeout.
 
     Waits until the |function| evalues to |expect_retval| or until |timeout|
     secs, whichever occurs earlier.
 
     This is better than using a sleep, since it waits (almost) only as much
     as needed.
@@ skipping 5689 matching lines @@
     successful = result.wasSuccessful()
     if not successful:
       pyauto_tests_file = os.path.join(self.TestsDir(), self._tests_filename)
       print >>sys.stderr, 'Tests can be disabled by editing %s. ' \
                           'Ref: %s' % (pyauto_tests_file, _PYAUTO_DOC_URL)
     sys.exit(not successful)
 
 
 if __name__ == '__main__':
   Main()