| Index: chrome/browser/importer/ie_importer.cc
|
| diff --git a/chrome/browser/importer/ie_importer.cc b/chrome/browser/importer/ie_importer.cc
|
| index d10453c051c55a57caae8319be790e59034548c9..323de192b48b2a4dc219a18abc5c388172dc01f5 100644
|
| --- a/chrome/browser/importer/ie_importer.cc
|
| +++ b/chrome/browser/importer/ie_importer.cc
|
| @@ -526,7 +526,7 @@ void IEImporter::ParseFavoritesFolder(const FavoritesInfo& info,
|
| // C:\Users\Foo\Favorites\Links\Bar\Baz.url -> "Links\Bar"
|
| FilePath::StringType relative_string =
|
| shortcut.DirName().value().substr(favorites_path_len);
|
| - if (relative_string.size() > 0 && FilePath::IsSeparator(relative_string[0]))
|
| + if (!relative_string.empty() && FilePath::IsSeparator(relative_string[0]))
|
| relative_string = relative_string.substr(1);
|
| FilePath relative_path(relative_string);
|
|
|
| @@ -541,7 +541,7 @@ void IEImporter::ParseFavoritesFolder(const FavoritesInfo& info,
|
| // 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.path.empty() && entry.path[0] == info.links_folder)) {
|
| entry.in_toolbar = true;
|
| entry.path.erase(entry.path.begin());
|
| toolbar_bookmarks.push_back(entry);
|
|
|