Remove unused sorting options from DirectoryLister.

net/base/directory_lister.h

 // 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.
 
 #ifndef NET_BASE_DIRECTORY_LISTER_H_
 #define NET_BASE_DIRECTORY_LISTER_H_
 
 #include <vector>
 
 #include "base/atomicops.h"
@@ skipping 26 matching lines @@
     // Called for each file found by the lister.
     virtual void OnListFile(const DirectoryListerData& data) = 0;
 
     // Called when the listing is complete.
     virtual void OnListDone(int error) = 0;
 
    protected:
     virtual ~DirectoryListerDelegate() {}
   };
 
-  // Sort options
-  // ALPHA_DIRS_FIRST is the default sort :
+  // Listing options
+  // ALPHA_DIRS_FIRST is the default listing type:
   //   directories first in name order, then files by name order
-  // FULL_PATH sorts by paths as strings, ignoring files v. directories
-  // DATE sorts by last modified date
-  // TODO(mmenke):  Only NO_SORT and ALPHA_DIRS_FIRST appear to be used in
-  //     production code, and there's very little testing of some of these
-  //     options.  Remove unused options, improve testing of the others.
-  enum SortType {
+  // Listing is recursive only if listing type is NO_SORT_RECURSIVE.
+  // TODO(mmenke): Improve testing.
+  enum ListingType {
     NO_SORT,
-    DATE,
+    NO_SORT_RECURSIVE,
     ALPHA_DIRS_FIRST,
-    FULL_PATH
   };
 
   DirectoryLister(const base::FilePath& dir,
                   DirectoryListerDelegate* delegate);
 
   DirectoryLister(const base::FilePath& dir,
-                  bool recursive,
-                  SortType sort,
+                  ListingType type,
                   DirectoryListerDelegate* delegate);
 
   // Will invoke Cancel().
   ~DirectoryLister();
 
   // Call this method to start the directory enumeration thread.
   bool Start();
 
   // Call this method to asynchronously stop directory enumeration.  The
   // delegate will not be called back.
   void Cancel();
 
  private:
   typedef std::vector<DirectoryListerData> DirectoryList;
 
   // Class responsible for retrieving and sorting the actual directory list on
   // a worker pool thread. Created on the DirectoryLister's thread. As it's
   // refcounted, it's destroyed when the final reference is released, which may
   // happen on either thread.
   //
   // It's kept alive during the calls to Start() and DoneOnOriginThread() by the
   // reference owned by the callback itself.
   class Core : public base::RefCountedThreadSafe<Core> {
    public:
-    Core(const base::FilePath& dir,
-         bool recursive,
-         SortType sort,
-         DirectoryLister* lister);
+    Core(const base::FilePath& dir, ListingType type, DirectoryLister* lister);
 
     // May only be called on a worker pool thread.
     void Start();
 
     // Must be called on the origin thread.
     void CancelOnOriginThread();
 
    private:
     friend class base::RefCountedThreadSafe<Core>;
     class DataEvent;
 
     ~Core();
 
     // Called on both threads.
     bool IsCancelled() const;
 
     // Called on origin thread.
     void DoneOnOriginThread(scoped_ptr<DirectoryList> directory_list,
                             int error) const;
 
     const base::FilePath dir_;
-    const bool recursive_;
-    const SortType sort_;
+    const ListingType type_;
     const scoped_refptr<base::MessageLoopProxy> origin_loop_;
 
     // Only used on the origin thread.
     DirectoryLister* lister_;
 
     // Set to 1 on cancellation. Used both to abort listing files early on the
     // worker pool thread for performance reasons and to ensure |lister_| isn't
     // called after cancellation on the origin thread.
     base::subtle::Atomic32 cancelled_;
 
     DISALLOW_COPY_AND_ASSIGN(Core);
   };
 
   // Call into the corresponding DirectoryListerDelegate. Must not be called
   // after cancellation.
   void OnListFile(const DirectoryListerData& data);
   void OnListDone(int error);
 
   scoped_refptr<Core> core_;
   DirectoryListerDelegate* const delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(DirectoryLister);
 };
 
 }  // namespace net
 
 #endif  // NET_BASE_DIRECTORY_LISTER_H_