Revert 184352

chrome/browser/importer/firefox3_importer.cc

 // 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.
 
 #include "chrome/browser/importer/firefox3_importer.h"
 
 #include <set>
 
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 377 matching lines @@
       if (index != std::string::npos) {
         // Remove '[app]/'.
         file = app_path.AppendASCII(engine.substr(index + kAppPrefix.length()));
       } else if ((index = engine.find(kProfilePrefix)) != std::string::npos) {
         // Remove '[profile]/'.
           file = profile_path.AppendASCII(
               engine.substr(index + kProfilePrefix.length()));
       } else {
         // Looks like absolute path to the file.
 #if defined(OS_WIN)
-        file = base::FilePath(base::UTF8ToWide(engine));
+        file = base::FilePath(UTF8ToWide(engine));
 #else
         file = base::FilePath(engine);
 #endif
       }
       files->push_back(file);
     } while (s.Step() && !cancelled());
   }
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
   // Ubuntu-flavored Firefox3 supports locale-specific search engines via
@@ skipping 153 matching lines @@
 
       if (!importer::ReencodeFavicon(&data[0], data.size(), &usage.png_data))
         continue;  // Unable to decode.
 
       usage.urls = i->second;
       favicons->push_back(usage);
     }
     s.Reset(true);
   }
 }