Media Galleries: Refactor test to not need RunSecondPhase().

chrome/test/data/extensions/api_test/media_galleries/read_access/test.js

 // 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.
 
 var mediaGalleries = chrome.mediaGalleries;
 
 var galleries;
 var testResults = [];
 var foundGalleryWithEntry = false;
-var expectedGalleryEntryLength = 306;  // hard-coded size of ../common/test.jpg
+var expectedFileSystems;
+var expectedGalleryEntryLength;
 
 function checkFinished() {
   if (testResults.length != galleries.length)
     return;
   var success = true;
   for (var i = 0; i < testResults.length; i++) {
     if (testResults[i]) {
       success = false;
     }
   }
@@ skipping 48 matching lines @@
     testResults.push("Found a gallery with more than 1 FileEntry");
   }
   checkFinished();
 }
 
 var mediaFileSystemsDirectoryErrorCallback = function(err) {
   testResults.push("Couldn't read from directory: " + err);
   checkFinished();
 };
 
-function testGalleries(expectedFileSystems) {
-  chrome.test.assertEq(expectedFileSystems, galleries.length);
-  if (expectedFileSystems == 0) {
-    chrome.test.succeed();
-    return;
-  }
-
-  for (var i = 0; i < galleries.length; i++) {
-    var dirReader = galleries[i].root.createReader();
-    dirReader.readEntries(mediaFileSystemsDirectoryEntryCallback,
-                          mediaFileSystemsDirectoryErrorCallback);
-  }
-};
-
 var mediaFileSystemsListCallback = function(results) {
   galleries = results;
 };
 
-chrome.test.runTests([
-  function mediaGalleriesReadAccess() {
-    mediaGalleries.getMediaFileSystems(
-        chrome.test.callbackPass(mediaFileSystemsListCallback));
-  },
-]);
+chrome.test.getConfig(function(config) {
+  customArg = JSON.parse(config.customArg);
+  expectedFileSystems = customArg[0];
+  expectedGalleryEntryLength = customArg[1];
+
+  chrome.test.runTests([
+    function getMediaFileSystems() {
+      mediaGalleries.getMediaFileSystems(
+          chrome.test.callbackPass(mediaFileSystemsListCallback));
+    },
+    function readFileSystems() {
+      chrome.test.assertEq(expectedFileSystems, galleries.length);
+      if (expectedFileSystems == 0) {
+        chrome.test.succeed();
+        return;
+      }
+
+      for (var i = 0; i < galleries.length; i++) {
+        var dirReader = galleries[i].root.createReader();
+        dirReader.readEntries(mediaFileSystemsDirectoryEntryCallback,
+                              mediaFileSystemsDirectoryErrorCallback);
+      }
+    },
+  ]);
+})