Gallery.app: Replace the existing gallery with the new separated gallery.

This CL starts to use the new separated gallery without specifying the
file-manager-enable-new-gallery flag.

BUG=358698
TEST=none

Review URL: https://codereview.chromium.org/285373015

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271546 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 2 insertions, 63 deletions

diff --git a/chrome/test/data/extensions/api_test/file_manager_browsertest/manifest.json b/chrome/test/data/extensions/api_test/file_manager_browsertest/manifest.json
index 2663b55..97d94de 100644
--- a/chrome/test/data/extensions/api_test/file_manager_browsertest/manifest.json
+++ b/chrome/test/data/extensions/api_test/file_manager_browsertest/manifest.json
@@ -19,7 +19,7 @@
       "multi_profile.js",
       "navigation_list.js",
       "open_audio_files.js",
-      "open_special_types.js",
+      "open_zip_files.js",
       "open_video_files.js",
       "restore_geometry.js",
       "restore_prefs.js",
diff --git a/chrome/test/data/extensions/api_test/file_manager_browsertest/open_special_types.js b/chrome/test/data/extensions/api_test/file_manager_browsertest/open_zip_files.js
index 1fd97e3..d76897a 100644
--- a/chrome/test/data/extensions/api_test/file_manager_browsertest/open_special_types.js
+++ b/chrome/test/data/extensions/api_test/file_manager_browsertest/open_zip_files.js
@@ -1,63 +1,10 @@
-// Copyright (c) 2014 The Chromium Authors. All rights reserved.
+// Copyright 2014 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.
 
 'use strict';
 
 /**
- * Tests if the gallery shows up for the selected image and that the image
- * gets displayed.
- *
- * @param {string} path Directory path to be tested.
- */
-function galleryOpen(path) {
-  var appId;
-  StepsRunner.run([
-    function() {
-      setupAndWaitUntilReady(null, path, this.next);
-    },
-    // Resize the window to desired dimensions to avoid flakyness.
-    function(inAppId) {
-      appId = inAppId;
-      callRemoteTestUtil('resizeWindow',
-                         appId,
-                         [480, 480],
-                         this.next);
-    },
-    // Select the image.
-    function(result) {
-      chrome.test.assertTrue(result);
-      callRemoteTestUtil('openFile',
-                         appId,
-                         ['My Desktop Background.png'],
-                         this.next);
-    },
-    // Wait for the image in the gallery's screen image.
-    function(result) {
-      chrome.test.assertTrue(result);
-      waitForElement(appId,
-                     '.gallery .content canvas.image',
-                     'iframe.overlay-pane').then(this.next);
-    },
-    // Verify the gallery's screen image.
-    function(element) {
-      chrome.test.assertEq('480', element.attributes.width);
-      chrome.test.assertEq('360', element.attributes.height);
-      // Get the full-resolution image.
-      waitForElement(appId,
-                         '.gallery .content canvas.fullres',
-                         'iframe.overlay-pane').then(this.next);
-    },
-    // Verify the gallery's full resolution image.
-    function(element) {
-      chrome.test.assertEq('800', element.attributes.width);
-      chrome.test.assertEq('600', element.attributes.height);
-      checkIfNoErrorsOccured(this.next);
-    }
-  ]);
-}
-
-/**
  * Tests if we can open and unmount a zip file.
  * @param {string} path Directory path to be tested.
  */
@@ -124,14 +71,6 @@ function zipOpen(path) {
   ]);
 }
 
-testcase.galleryOpenDownloads = function() {
-  galleryOpen(RootPath.DOWNLOADS);
-};
-
-testcase.galleryOpenDrive = function() {
-  galleryOpen(RootPath.DRIVE);
-};
-
 testcase.zipOpenDownloads = function() {
   zipOpen(RootPath.DOWNLOADS);
 };