Move PathComponents from file_util to FilePath, add FilePath::IsParent()

chrome/browser/importer/ie_importer.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/importer/ie_importer.h"
 
 #include <atlbase.h>
 #include <intshcut.h>
 #include <pstore.h>
 #include <shlobj.h>
 #include <urlhist.h>
 
 #include <algorithm>
 
 #include "app/l10n_util.h"
 #include "app/win_util.h"
+#include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/registry.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/win_util.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/password_manager/ie7_password.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/common/time_format.h"
 #include "chrome/common/url_constants.h"
@@ skipping 482 matching lines @@
     if (relative_string.size() > 0 && FilePath::IsSeparator(relative_string[0]))
       relative_string = relative_string.substr(1);
     FilePath relative_path(relative_string);
 
     ProfileWriter::BookmarkEntry entry;
     // Remove the dot, the file extension, and the directory path.
     entry.title = shortcut.RemoveExtension().BaseName().value();
     entry.url = url;
     entry.creation_time = GetFileCreationTime(*it);
     if (!relative_path.empty())
-      file_util::PathComponents(relative_path, &entry.path);
+      relative_path.GetComponents(&entry.path);
 
     // Flatten the bookmarks in Link folder onto bookmark toolbar. Otherwise,
     // put it into "Other bookmarks".
     if (import_to_bookmark_bar() &&
         (entry.path.size() > 0 && entry.path[0] == info.links_folder)) {
       entry.in_toolbar = true;
       entry.path.erase(entry.path.begin());
       toolbar_bookmarks.push_back(entry);
     } else {
       // We put the bookmarks in a "Imported From IE"
@@ skipping 38 matching lines @@
   if (version < 0) {
     wchar_t buffer[128];
     DWORD buffer_length = sizeof(buffer);
     bool result = ReadFromRegistry(HKEY_LOCAL_MACHINE,
         L"Software\\Microsoft\\Internet Explorer",
         L"Version", buffer, &buffer_length);
     version = (result ? _wtoi(buffer) : 0);
   }
   return version;
 }