Revert of Make the sort order in thumbnail view always alphabetical.

Revert of Make the sort order in thumbnail view always alphabetical. (patchset #2 id:20001 of https://codereview.chromium.org/755363004/)

Reason for revert:
Speculative revert for crbug.com/440659.

Original issue's description:
> Make the sort order in thumbnail view always alphabetical.
> 
> Implemented sort related wrapper to ListContainer to fix the actual sort order
> in thumbnail view in alphabetical order.
> 
> BUG=438915
> TEST=sort files non-alphabetically in list view, change view to grid view, and confirm the sort order is alphabetical.
> After that, change view to list view, and confirm that the first sort order is restored.
> 
> Committed: https://crrev.com/bd854587a2e1b3ca8e7b13299e3d74978b1933f9
> Cr-Commit-Position: refs/heads/master@{#307233}

TBR=hirono@chromium.org,fukino@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=438915

[ilja, 2014-12-10 05:36:19]

Created Revert of Make the sort order in thumbnail view always alphabetical.

[commit-bot: I haz the power, 2014-12-10 05:36:28]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/789133002/1

[commit-bot: I haz the power, 2014-12-10 05:36:29]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-12-10 05:36:31]

No LGTM from a valid reviewer yet. Only full committers are accepted.
Even if an LGTM may have been provided, it was from a non-committer,
_not_ a full super star committer.
See http://www.chromium.org/getting-involved/become-a-committer
Note that this has nothing to do with OWNERS files.

[ilja, 2014-12-10 05:39:45]

ihf@chromium.org changed reviewers:
+ flackr@chromium.org, xiyuan@chromium.org

[fukino, 2014-12-10 05:45:30]

On 2014/12/10 05:36:19, ilja wrote:
> Created Revert of Make the sort order in thumbnail view always alphabetical.

lgtm. It looks my fault. Sorry about that...

[fukino, 2014-12-10 05:46:14]

The CQ bit was checked by fukino@chromium.org

[commit-bot: I haz the power, 2014-12-10 05:46:31]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/789133002/1

[commit-bot: I haz the power, 2014-12-10 05:46:49]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-12-10 05:46:50]

Failed to apply patch for
chrome/test/data/extensions/api_test/file_manager_browsertest/file_manager/grid_view.js:
While running git apply --index -3 -p1;
  Created missing directory
chrome/test/data/extensions/api_test/file_manager_browsertest/file_manager.
  error:
chrome/test/data/extensions/api_test/file_manager_browsertest/file_manager/grid_view.js:
does not exist in index

Patch:      
chrome/test/data/extensions/api_test/file_manager_browsertest/file_manager/grid_view.js
Index:
chrome/test/data/extensions/api_test/file_manager_browsertest/file_manager/grid_view.js
diff --git
a/chrome/test/data/extensions/api_test/file_manager_browsertest/file_manager/grid_view.js
b/chrome/test/data/extensions/api_test/file_manager_browsertest/file_manager/grid_view.js
index
228e64fb0bc9cde18604ccdc09d1c0207fbc8f1f..1b60e14118b8fc2ffcb6be7dd34ba3387b06085c
100644
---
a/chrome/test/data/extensions/api_test/file_manager_browsertest/file_manager/grid_view.js
+++
b/chrome/test/data/extensions/api_test/file_manager_browsertest/file_manager/grid_view.js
@@ -3,52 +3,6 @@
 // found in the LICENSE file.
 
 'use strict';
-
-/**
- * Clicks the toggle-view button.
- * @param {string} windowId
- * @return {!Promise}
- */
-function clickToggleViewButton(windowId) {
-  return remoteCall.waitForElement(windowId, '#view-button').then(function() {
-    return remoteCall.callRemoteTestUtil(
-        'fakeEvent', windowId, ['#view-button', 'click']);
-  });
-}
-
-/**
- * Waits until the given entry set is loaded in the current file list.
- * @param {string} windowId
- * @param {Array.<TestEntryInfo>} expectedSet
- * @param {boolean} orderCheck Whether this function waits fils appearing in
the
- *     same order with expectedSet.
- */
-function waitForGridViewFiles(windowId, expectedSet, orderCheck) {
-  var expectedLabels = expectedSet.map(function(entryInfo) {
-    return entryInfo.nameText;
-  });
-  return repeatUntil(function() {
-    var labelsPromise = remoteCall.callRemoteTestUtil(
-        'queryAllElements',
-        windowId,
-        ['grid:not([hidden]) .thumbnail-item .entry-name']);
-    return labelsPromise.then(function(labels) {
-      var actualLabels = labels.map(function(label) {
-        return label.text;
-      });
-      if (!orderCheck) {
-        expectedLabels.sort();
-        actualLabels.sort();
-      }
-      if (chrome.test.checkDeepEq(expectedLabels, actualLabels))
-        return true;
-      return pending(
-          'Failed to compare the grid lables, expected: %j, actual %j.',
-          expectedLabels,
-          actualLabels);
-    });
-  });
-}
 
 /**
  * Shows the grid view and checks the label texts of entries.
@@ -61,81 +15,39 @@
  *     result.
  */
 function showGridView(rootPath, expectedSet) {
-  var windowId;
+  var expectedLabels = expectedSet.map(function(entryInfo) {
+    return entryInfo.nameText;
+  }).sort();
   var setupPromise = setupAndWaitUntilReady(null, rootPath);
-  return setupPromise.then(function(inWindowId) {
-    windowId = inWindowId;
-    return clickToggleViewButton(windowId);
-  }).then(function() {
+  return setupPromise.then(function(windowId) {
+    // Click the grid view button.
+    var clickedPromise = remoteCall.waitForElement(windowId, '#view-button').
+        then(function() {
+          return remoteCall.callRemoteTestUtil(
+              'fakeEvent', windowId, ['#view-button', 'click']);
+        });
+
     // Compare the grid labels of the entries.
-    return waitForGridViewFiles(windowId, expectedSet, false);
+    return clickedPromise.then(function() {
+      return repeatUntil(function() {
+        var labelsPromise = remoteCall.callRemoteTestUtil(
+            'queryAllElements',
+            windowId,
+            ['grid:not([hidden]) .thumbnail-item .entry-name']);
+        return labelsPromise.then(function(labels) {
+          var actualLabels = labels.map(function(label) {
+            return label.text;
+          }).sort();
+          if (chrome.test.checkDeepEq(expectedLabels, actualLabels))
+            return true;
+          return pending(
+              'Failed to compare the grid lables, expected: %j, actual %j.',
+              expectedLabels,
+              actualLabels);
+        });
+      });
+    });
   });
-}
-
-/**
- * Checks that files are sorted by name alphabetically in grid view, and the
- * order in list view is kept on toggling the view.
- *
- * @return {Promise} Promise to be fulfilled or rejected depending on the test
- *     result.
- */
-function checkFilesSortedInGridView() {
-  // Entries in RootPath.DOWNLOADS, sorted by their names.
-  var ENTRIES_SORTED_BY_NAME = [
-    ENTRIES.photos,     // Folder: photos
-    ENTRIES.beautiful,  // File: Beautiful Song.ogg (14 KB)
-    ENTRIES.hello,      // File: hello.txt (51 B)
-    ENTRIES.desktop,    // File: My Desktop Background.png (272 B)
-    ENTRIES.world       // File: world.ogv (59 KB)
-  ];
-  // Entries in RootPath.DOWNLOADS, sorted by their sizes.
-  var ENTRIES_SORTED_BY_SIZE = [
-    ENTRIES.photos,     // Folder: photos
-    ENTRIES.world,      // File: world.ogv (59 KB)
-    ENTRIES.beautiful,  // File: Beautiful Song.ogg (14 KB)
-    ENTRIES.desktop,    // File: My Desktop Background.png (272 B)
-    ENTRIES.hello       // File: hello.txt (51 B)
-  ];
-
-  var windowId;
-  return setupAndWaitUntilReady(null, RootPath.DOWNLOADS)
-      .then(function(inWindowId) {
-        windowId = inWindowId;
-        // Sort by size by clicking column header.
-        return remoteCall.callRemoteTestUtil(
-            'fakeMouseClick', windowId, ['.table-header-cell:nth-of-type(2)']);
-      })
-      .then(function() {
-        // Wait until the descending icon appears.
-        return remoteCall.waitForElement(windowId,
-                                         '.table-header-sort-image-desc');
-      })
-      .then(function() {
-        // Check if the files are sorted by size.
-        return remoteCall.waitForFiles(
-            windowId,
-            TestEntryInfo.getExpectedRows(ENTRIES_SORTED_BY_SIZE),
-            {orderCheck: true});
-      })
-      .then(function() {
-        // Change the view to the grid view
-        return clickToggleViewButton(windowId);
-      })
-      .then(function() {
-        // Check if the files are sorted by name in grid view.
-        return waitForGridViewFiles(windowId, ENTRIES_SORTED_BY_NAME, true);
-      })
-      .then(function() {
-        // Change the view to the list view.
-        return clickToggleViewButton(windowId);
-      })
-      .then(function() {
-        // Check if the sort order is restored to 'by size' in list view.
-        return remoteCall.waitForFiles(
-            windowId,
-            TestEntryInfo.getExpectedRows(ENTRIES_SORTED_BY_SIZE),
-            {orderCheck: true});
-      });
 }
 
 /**
@@ -153,10 +65,3 @@
   testPromise(showGridView(
       RootPath.DRIVE, BASIC_DRIVE_ENTRY_SET));
 };
-
-/**
- * Tests that files are always sorted by name alphabetically in grid view.
- */
-testcase.checkFilesSorted = function() {
-  testPromise(checkFilesSortedInGridView());
-};

[commit-bot: I haz the power, 2014-12-10 05:46:52]

The CQ bit was unchecked by commit-bot@chromium.org

[fukino, 2014-12-10 05:51:59]

On 2014/12/10 05:46:50, I haz the power (commit-bot) wrote:
> Failed to apply patch for
>
chrome/test/data/extensions/api_test/file_manager_browsertest/file_manager/grid_view.js:
> While running git apply --index -3 -p1;
>   Created missing directory
> chrome/test/data/extensions/api_test/file_manager_browsertest/file_manager.
>   error:
>
chrome/test/data/extensions/api_test/file_manager_browsertest/file_manager/grid_view.js:
> does not exist in index
> 
> Patch:      
>
chrome/test/data/extensions/api_test/file_manager_browsertest/file_manager/grid_view.js
> Index:
>
chrome/test/data/extensions/api_test/file_manager_browsertest/file_manager/grid_view.js
> diff --git
>
a/chrome/test/data/extensions/api_test/file_manager_browsertest/file_manager/grid_view.js
>
b/chrome/test/data/extensions/api_test/file_manager_browsertest/file_manager/grid_view.js
> index
>
228e64fb0bc9cde18604ccdc09d1c0207fbc8f1f..1b60e14118b8fc2ffcb6be7dd34ba3387b06085c
> 100644
> ---
>
a/chrome/test/data/extensions/api_test/file_manager_browsertest/file_manager/grid_view.js
> +++
>
b/chrome/test/data/extensions/api_test/file_manager_browsertest/file_manager/grid_view.js
> @@ -3,52 +3,6 @@
>  // found in the LICENSE file.
>  
>  'use strict';
> -
> -/**
> - * Clicks the toggle-view button.
> - * @param {string} windowId
> - * @return {!Promise}
> - */
> -function clickToggleViewButton(windowId) {
> -  return remoteCall.waitForElement(windowId, '#view-button').then(function()
{
> -    return remoteCall.callRemoteTestUtil(
> -        'fakeEvent', windowId, ['#view-button', 'click']);
> -  });
> -}
> -
> -/**
> - * Waits until the given entry set is loaded in the current file list.
> - * @param {string} windowId
> - * @param {Array.<TestEntryInfo>} expectedSet
> - * @param {boolean} orderCheck Whether this function waits fils appearing in
> the
> - *     same order with expectedSet.
> - */
> -function waitForGridViewFiles(windowId, expectedSet, orderCheck) {
> -  var expectedLabels = expectedSet.map(function(entryInfo) {
> -    return entryInfo.nameText;
> -  });
> -  return repeatUntil(function() {
> -    var labelsPromise = remoteCall.callRemoteTestUtil(
> -        'queryAllElements',
> -        windowId,
> -        ['grid:not([hidden]) .thumbnail-item .entry-name']);
> -    return labelsPromise.then(function(labels) {
> -      var actualLabels = labels.map(function(label) {
> -        return label.text;
> -      });
> -      if (!orderCheck) {
> -        expectedLabels.sort();
> -        actualLabels.sort();
> -      }
> -      if (chrome.test.checkDeepEq(expectedLabels, actualLabels))
> -        return true;
> -      return pending(
> -          'Failed to compare the grid lables, expected: %j, actual %j.',
> -          expectedLabels,
> -          actualLabels);
> -    });
> -  });
> -}
>  
>  /**
>   * Shows the grid view and checks the label texts of entries.
> @@ -61,81 +15,39 @@
>   *     result.
>   */
>  function showGridView(rootPath, expectedSet) {
> -  var windowId;
> +  var expectedLabels = expectedSet.map(function(entryInfo) {
> +    return entryInfo.nameText;
> +  }).sort();
>    var setupPromise = setupAndWaitUntilReady(null, rootPath);
> -  return setupPromise.then(function(inWindowId) {
> -    windowId = inWindowId;
> -    return clickToggleViewButton(windowId);
> -  }).then(function() {
> +  return setupPromise.then(function(windowId) {
> +    // Click the grid view button.
> +    var clickedPromise = remoteCall.waitForElement(windowId, '#view-button').
> +        then(function() {
> +          return remoteCall.callRemoteTestUtil(
> +              'fakeEvent', windowId, ['#view-button', 'click']);
> +        });
> +
>      // Compare the grid labels of the entries.
> -    return waitForGridViewFiles(windowId, expectedSet, false);
> +    return clickedPromise.then(function() {
> +      return repeatUntil(function() {
> +        var labelsPromise = remoteCall.callRemoteTestUtil(
> +            'queryAllElements',
> +            windowId,
> +            ['grid:not([hidden]) .thumbnail-item .entry-name']);
> +        return labelsPromise.then(function(labels) {
> +          var actualLabels = labels.map(function(label) {
> +            return label.text;
> +          }).sort();
> +          if (chrome.test.checkDeepEq(expectedLabels, actualLabels))
> +            return true;
> +          return pending(
> +              'Failed to compare the grid lables, expected: %j, actual %j.',
> +              expectedLabels,
> +              actualLabels);
> +        });
> +      });
> +    });
>    });
> -}
> -
> -/**
> - * Checks that files are sorted by name alphabetically in grid view, and the
> - * order in list view is kept on toggling the view.
> - *
> - * @return {Promise} Promise to be fulfilled or rejected depending on the
test
> - *     result.
> - */
> -function checkFilesSortedInGridView() {
> -  // Entries in RootPath.DOWNLOADS, sorted by their names.
> -  var ENTRIES_SORTED_BY_NAME = [
> -    ENTRIES.photos,     // Folder: photos
> -    ENTRIES.beautiful,  // File: Beautiful Song.ogg (14 KB)
> -    ENTRIES.hello,      // File: hello.txt (51 B)
> -    ENTRIES.desktop,    // File: My Desktop Background.png (272 B)
> -    ENTRIES.world       // File: world.ogv (59 KB)
> -  ];
> -  // Entries in RootPath.DOWNLOADS, sorted by their sizes.
> -  var ENTRIES_SORTED_BY_SIZE = [
> -    ENTRIES.photos,     // Folder: photos
> -    ENTRIES.world,      // File: world.ogv (59 KB)
> -    ENTRIES.beautiful,  // File: Beautiful Song.ogg (14 KB)
> -    ENTRIES.desktop,    // File: My Desktop Background.png (272 B)
> -    ENTRIES.hello       // File: hello.txt (51 B)
> -  ];
> -
> -  var windowId;
> -  return setupAndWaitUntilReady(null, RootPath.DOWNLOADS)
> -      .then(function(inWindowId) {
> -        windowId = inWindowId;
> -        // Sort by size by clicking column header.
> -        return remoteCall.callRemoteTestUtil(
> -            'fakeMouseClick', windowId,
['.table-header-cell:nth-of-type(2)']);
> -      })
> -      .then(function() {
> -        // Wait until the descending icon appears.
> -        return remoteCall.waitForElement(windowId,
> -                                         '.table-header-sort-image-desc');
> -      })
> -      .then(function() {
> -        // Check if the files are sorted by size.
> -        return remoteCall.waitForFiles(
> -            windowId,
> -            TestEntryInfo.getExpectedRows(ENTRIES_SORTED_BY_SIZE),
> -            {orderCheck: true});
> -      })
> -      .then(function() {
> -        // Change the view to the grid view
> -        return clickToggleViewButton(windowId);
> -      })
> -      .then(function() {
> -        // Check if the files are sorted by name in grid view.
> -        return waitForGridViewFiles(windowId, ENTRIES_SORTED_BY_NAME, true);
> -      })
> -      .then(function() {
> -        // Change the view to the list view.
> -        return clickToggleViewButton(windowId);
> -      })
> -      .then(function() {
> -        // Check if the sort order is restored to 'by size' in list view.
> -        return remoteCall.waitForFiles(
> -            windowId,
> -            TestEntryInfo.getExpectedRows(ENTRIES_SORTED_BY_SIZE),
> -            {orderCheck: true});
> -      });
>  }
>  
>  /**
> @@ -153,10 +65,3 @@
>    testPromise(showGridView(
>        RootPath.DRIVE, BASIC_DRIVE_ENTRY_SET));
>  };
> -
> -/**
> - * Tests that files are always sorted by name alphabetically in grid view.
> - */
> -testcase.checkFilesSorted = function() {
> -  testPromise(checkFilesSortedInGridView());
> -};

Ah, it looks we need rebase. I'll revert the patch by my own patch.

[fukino, 2014-12-10 06:26:24]

I made a own CL and sent it to CQ: https://codereview.chromium.org/788113003/

[fukino, 2014-12-11 10:46:12]

Hi ilja@, could you close this CL as https://codereview.chromium.org/788113003/
has landed? Thanks!