Move FileEnumerator to its own file, do some refactoring.

chrome/browser/web_applications/web_app_mac.mm

 // 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.
 
 #import "chrome/browser/web_applications/web_app_mac.h"
 
 #import <Carbon/Carbon.h>
 #import <Cocoa/Cocoa.h>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
+#include "base/files/file_enumerator.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/mac/bundle_locations.h"
 #include "base/mac/foundation_util.h"
 #include "base/mac/launch_services_util.h"
 #include "base/mac/mac_logging.h"
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/memory/scoped_nsobject.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/string_util.h"
@@ skipping 113 matching lines @@
 
 // Given the path to an app bundle, return the resources directory.
 base::FilePath GetResourcesPath(const base::FilePath& app_path) {
   return app_path.Append("Contents").Append("Resources");
 }
 
 bool HasExistingExtensionShim(const base::FilePath& destination_directory,
                               const std::string& extension_id,
                               const base::FilePath& own_basename) {
   // Check if there any any other shims for the same extension.
-  file_util::FileEnumerator enumerator(destination_directory,
-                                       false /* recursive */,
-                                       file_util::FileEnumerator::DIRECTORIES);
+  base::FileEnumerator enumerator(destination_directory,
+                                  false /* recursive */,
+                                  base::FileEnumerator::DIRECTORIES);
   for (base::FilePath shim_path = enumerator.Next();
        !shim_path.empty(); shim_path = enumerator.Next()) {
     if (shim_path.BaseName() != own_basename &&
         EndsWith(shim_path.RemoveExtension().value(),
                  extension_id,
                  true /* case_sensitive */)) {
       return true;
     }
   }
 
@@ skipping 297 matching lines @@
     const base::FilePath& web_app_path,
     const string16& old_app_title,
     const ShellIntegration::ShortcutInfo& shortcut_info) {
   // TODO(benwells): Implement this when shortcuts / weblings are enabled on
   // mac.
 }
 
 }  // namespace internals
 
 }  // namespace web_app