| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 var mediaGalleries = chrome.mediaGalleries; | 5 var mediaGalleries = chrome.mediaGalleries; |
| 6 var expectedGalleryEntryLength; // Size of ../common/test.jpg. | 6 var expectedGalleryEntryLength; // Size of ../common/test.jpg. |
| 7 | 7 |
| 8 //Verifies a directory itself, then the contents. | 8 //Verifies a directory itself, then the contents. |
| 9 function getAndVerifyDirectoryEntry(parentEntry, directoryName, | 9 function getAndVerifyDirectoryEntry(parentEntry, directoryName, |
| 10 verifyFunction) { | 10 verifyFunction) { |
| (...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 152 } | 152 } |
| 153 } | 153 } |
| 154 chrome.test.fail("Picasa gallery not found"); | 154 chrome.test.fail("Picasa gallery not found"); |
| 155 } | 155 } |
| 156 | 156 |
| 157 return function() { | 157 return function() { |
| 158 getMediaFileSystemsList(); | 158 getMediaFileSystemsList(); |
| 159 } | 159 } |
| 160 } | 160 } |
| 161 | 161 |
| 162 CreateDummyWindowToPreventSleep(); | |
| 163 | |
| 164 chrome.test.getConfig(function(config) { | 162 chrome.test.getConfig(function(config) { |
| 165 customArg = JSON.parse(config.customArg); | 163 customArg = JSON.parse(config.customArg); |
| 166 expectedGalleryEntryLength = customArg[0]; | 164 expectedGalleryEntryLength = customArg[0]; |
| 167 | 165 |
| 168 chrome.test.runTests([ | 166 chrome.test.runTests([ |
| 169 getTest(GalleryPropertiesTest), | 167 getTest(GalleryPropertiesTest), |
| 170 getTest(RootListingTest), | 168 getTest(RootListingTest), |
| 171 getTest(AlbumsListingTest), | 169 getTest(AlbumsListingTest), |
| 172 getTest(FoldersListingTest), | 170 getTest(FoldersListingTest), |
| 173 getTest(Album1ListingTest), | 171 getTest(Album1ListingTest), |
| 174 getTest(Album2ListingTest), | 172 getTest(Album2ListingTest), |
| 175 getTest(Folder1ListingTest), | 173 getTest(Folder1ListingTest), |
| 176 getTest(Folder2ListingTest), | 174 getTest(Folder2ListingTest), |
| 177 ]); | 175 ]); |
| 178 }); | 176 }); |
| OLD | NEW |