Replace os.path.remove with os.remove

chrome/test/pyautolib/policy_base.py

 #!/usr/bin/python
 # Copyright (c) 2011 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.
 
 """Base class for tests that need to update the policies enforced by Chrome.
 
 Subclasses can call SetPolicies with a dictionary of policies to install.
 SetPolicies can also be used to set the device policies on ChromeOS.
 
@@ skipping 201 matching lines @@
     # Ugly hack: session manager won't spawn chrome if this file exists. That's
     # usually a good thing (to keep the automation channel open), but in this
     # case we really want to restart chrome. PyUITest.setUp() will be called
     # after session manager and chrome have restarted, and will setup the
     # automation channel.
     restore_magic_file = False
     if os.path.exists(constants.DISABLE_BROWSER_RESTART_MAGIC_FILE):
       logging.debug('DISABLE_BROWSER_RESTART_MAGIC_FILE found. '
                     'Removing temporarily for the next restart.')
       restore_magic_file = True
-      os.path.remove(constants.DISABLE_BROWSER_RESTART_MAGIC_FILE)
+      os.remove(constants.DISABLE_BROWSER_RESTART_MAGIC_FILE)
       assert not os.path.exists(constants.DISABLE_BROWSER_RESTART_MAGIC_FILE)
 
     logging.debug('Starting session manager again')
     cros_ui.start()
 
     # cros_ui.start() waits for the login prompt to be visible, so chrome has
     # already started once it returns.
     if restore_magic_file:
       open(constants.DISABLE_BROWSER_RESTART_MAGIC_FILE, 'w').close()
       assert os.path.exists(constants.DISABLE_BROWSER_RESTART_MAGIC_FILE)
@@ skipping 67 matching lines @@
 
     This policies will have been installed after this call returns.
     """
     if self.IsChromeOS():
       self._SetCloudPolicies(user_mandatory=user_policy, device=device_policy)
       self.RefreshPolicies()
     elif not self.GetBrowserInfo()['properties']['is_official']:
       pyauto.PyUITest.SetPolicies(self, managed_platform=user_policy)
     else:
       raise AssertionError('Not available on this platform and build.')