Fix chromeos_file_browser.ChromeosFileBrowserTest.testOpenMediaFiles

chrome/test/functional/chromeos_file_browser.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.
 
 import pyauto_functional
 import pyauto
 
 import chromeos.file_browser
 import test_utils
@@ skipping 60 matching lines @@
 
   def testOpenMediaFiles(self):
     """Test we can open media files from the file browser dialog."""
     media_files = ['bear.mp4', 'bear.ogv', 'bear_pcm.wav', 'bear.webm']
     private_media_files = ['emerge.m4a', 'sample.mp3', 'sample.m4v',
                            'sample.ogg']
     # TODO: .avi, .wmv are not yet (fully) supported on ChromeOS.
     #       .mov and .3gp only work in the Media Player. Once these format are
     #        supported on ChromeOS, include them in the test.
     for fname in media_files:
-      test_utils.CopyFileFromDataDirToDownloadDir(self, 'media/' + fname)
+      test_utils.CopyFileFromContentDataDirToDownloadDir(self,
+                                                         'media/' + fname)
     for fname in private_media_files:
       test_utils.CopyFileFromDataDirToDownloadDir(self, 'pyauto_private/media/' +\
                                                   fname)
     for fname in media_files + private_media_files:
       file_browser = self._GetOpenDialogFileBrowser()
       self.assertTrue(file_browser, msg='File browser failed to initialize.')
       if file_browser.CurrentDirectory() != '/Downloads':
         file_browser.ChangeDirectory('/Downloads/')
       self.assertTrue(file_browser.Select(fname),
                       msg='"%s" does not exist.' % fname)
@@ skipping 145 matching lines @@
                     msg='Remaining disk space = %dKB.' % remaining)
     self.assertTrue(total > 0,
                     msg='Total disk space = %dKB.' % total)
     self.assertTrue(total > remaining,
                     msg='Total space(%dKB) <= remaining space(%dKB).' %
                     (total, remaining))
 
 
 if __name__ == '__main__':
   pyauto_functional.Main()