Move file enumeration to filepaths.

chrome/browser/extensions/extensions_service.cc

 // Copyright (c) 2006-2008 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.
 
 #include "chrome/browser/extensions/extensions_service.h"
 
 #include "base/file_util.h"
 #include "base/values.h"
 #include "base/string_util.h"
 #include "base/thread.h"
@@ skipping 53 matching lines @@
 
 
 // ExtensionsServicesBackend
 
 bool ExtensionsServiceBackend::LoadExtensionsFromDirectory(
     const FilePath& path,
     scoped_refptr<ExtensionsServiceFrontendInterface> frontend) {
   // Find all child directories in the install directory and load their
   // manifests. Post errors and results to the frontend.
   scoped_ptr<ExtensionList> extensions(new ExtensionList);
-  file_util::FileEnumerator enumerator(path.ToWStringHack(),
+  file_util::FileEnumerator enumerator(path,
                                        false, // not recursive
                                        file_util::FileEnumerator::DIRECTORIES);
-  for (std::wstring child_path = enumerator.Next(); !child_path.empty();
+  for (FilePath child_path = enumerator.Next(); !child_path.value().empty();
        child_path = enumerator.Next()) {
-     FilePath manifest_path = FilePath::FromWStringHack(child_path).Append(
-         Extension::kManifestFilename);
+    FilePath manifest_path = child_path.Append(Extension::kManifestFilename);
     if (!file_util::PathExists(manifest_path)) {
-      ReportExtensionLoadError(frontend.get(), child_path,
+      ReportExtensionLoadError(frontend.get(), child_path.ToWStringHack(),
                                Extension::kInvalidManifestError);
       continue;
     }
 
     JSONFileValueSerializer serializer(manifest_path.ToWStringHack());
     Value* root = NULL;
     std::string error;
     if (!serializer.Deserialize(&root, &error)) {
-      ReportExtensionLoadError(frontend.get(), child_path, error);
+      ReportExtensionLoadError(frontend.get(), child_path.ToWStringHack(),
+                               error);
       continue;
     }
 
     scoped_ptr<Value> scoped_root(root);
     if (!root->IsType(Value::TYPE_DICTIONARY)) {
-      ReportExtensionLoadError(frontend.get(), child_path,
+      ReportExtensionLoadError(frontend.get(), child_path.ToWStringHack(),
                                Extension::kInvalidManifestError);
       continue;
     }
 
     scoped_ptr<Extension> extension(new Extension());
     if (!extension->InitFromValue(*static_cast<DictionaryValue*>(root),
                                   &error)) {
-      ReportExtensionLoadError(frontend.get(), child_path, error);
+      ReportExtensionLoadError(frontend.get(), child_path.ToWStringHack(),
+                               error);
       continue;
     }
 
     extensions->push_back(extension.release());
   }
 
   ReportExtensionsLoaded(frontend.get(), extensions.release());
   return true;
 }
 
 void ExtensionsServiceBackend::ReportExtensionLoadError(
     ExtensionsServiceFrontendInterface *frontend, const std::wstring& path,
     const std::string &error) {
   std::string message = StringPrintf("Could not load extension from '%s'. %s",
                                      WideToASCII(path).c_str(), error.c_str());
   frontend->GetMessageLoop()->PostTask(FROM_HERE, NewRunnableMethod(
       frontend, &ExtensionsServiceFrontendInterface::OnExtensionLoadError,
       message));
 }
 
 void ExtensionsServiceBackend::ReportExtensionsLoaded(
     ExtensionsServiceFrontendInterface *frontend, ExtensionList* extensions) {
   frontend->GetMessageLoop()->PostTask(FROM_HERE, NewRunnableMethod(
       frontend,
       &ExtensionsServiceFrontendInterface::OnExtensionsLoadedFromDirectory,
       extensions));
 }