| Index: chrome/test/functional/chromeos_security.py
|
| diff --git a/chrome/test/functional/chromeos_security.py b/chrome/test/functional/chromeos_security.py
|
| index 2788cee39892d2d8fb25f6904a84ac3d35a726c9..acbb54f2f32a74d8b7c2f2bb2420067aaa458f28 100644
|
| --- a/chrome/test/functional/chromeos_security.py
|
| +++ b/chrome/test/functional/chromeos_security.py
|
| @@ -170,10 +170,9 @@ class ChromeosSecurity(pyauto.PyUITest):
|
| self.assertTrue(
|
| file_name in [x['crx_file'] for x in self._bundled_crx_baseline],
|
| msg='Unexpected CRX file: ' + file_name)
|
| - crx_file = pyauto.FilePath(
|
| - os.path.join(self._bundled_crx_directory, file_name))
|
| + crx_file = os.path.join(self._bundled_crx_directory, file_name)
|
| self.assertTrue(self.InstallExtension(crx_file, False),
|
| - msg='Extension install failed: %s' % crx_file.value())
|
| + msg='Extension install failed: %s' % crx_file)
|
|
|
| # Verify that the permissions information in the baseline matches the
|
| # permissions associated with the installed bundled CRX extensions.
|
| @@ -184,10 +183,9 @@ class ChromeosSecurity(pyauto.PyUITest):
|
| # Install all bundled extensions on the device.
|
| for file_name in os.listdir(self._bundled_crx_directory):
|
| if file_name.endswith('.crx'):
|
| - crx_file = pyauto.FilePath(
|
| - os.path.join(self._bundled_crx_directory, file_name))
|
| + crx_file = os.path.join(self._bundled_crx_directory, file_name)
|
| self.assertTrue(self.InstallExtension(crx_file, False),
|
| - msg='Extension install failed: %s' % crx_file.value())
|
| + msg='Extension install failed: %s' % crx_file)
|
|
|
| # Ensure that the set of installed extension names precisely matches the
|
| # baseline.
|
|
|