Lands http://codereview.chromium.org/155128 for Thiago....

chrome/browser/importer/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/importer.h"
 
 #include <map>
 #include <set>
 
 #include "app/gfx/favicon_size.h"
@@ skipping 105 matching lines @@
     const BookmarkNode* parent =
         (it->in_toolbar ? model->GetBookmarkBarNode() : model->other_node());
     for (std::vector<std::wstring>::const_iterator i = it->path.begin();
          i != it->path.end(); ++i) {
       const BookmarkNode* child = NULL;
       const std::wstring& folder_name = (!import_to_bookmark_bar &&
           !it->in_toolbar && (i == it->path.begin())) ? real_first_folder : *i;
 
       for (int index = 0; index < parent->GetChildCount(); ++index) {
         const BookmarkNode* node = parent->GetChild(index);
-        if ((node->GetType() == history::StarredEntry::BOOKMARK_BAR ||
-             node->GetType() == history::StarredEntry::USER_GROUP) &&
+        if ((node->GetType() == BookmarkNode::BOOKMARK_BAR ||
+             node->GetType() == BookmarkNode::FOLDER) &&
             node->GetTitle() == folder_name) {
           child = node;
           break;
         }
       }
       if (child == NULL)
         child = model->AddGroup(parent, parent->GetChildCount(), folder_name);
       parent = child;
     }
     groups_added_to.insert(parent);
@@ skipping 156 matching lines @@
         NotificationService::NoDetails());
   }
 }
 
 std::wstring ProfileWriter::GenerateUniqueFolderName(
     BookmarkModel* model,
     const std::wstring& folder_name) {
   // Build a set containing the folder names of the other folder.
   std::set<std::wstring> other_folder_names;
   const BookmarkNode* other = model->other_node();
-  for (int i = 0; i < other->GetChildCount(); ++i) {
+
+  for (int i = 0, child_count = other->GetChildCount(); i < child_count; ++i) {
     const BookmarkNode* node = other->GetChild(i);
     if (node->is_folder())
       other_folder_names.insert(node->GetTitle());
   }
 
   if (other_folder_names.find(folder_name) == other_folder_names.end())
     return folder_name;  // Name is unique, use it.
 
   // Otherwise iterate until we find a unique name.
   for (int i = 1; i < 100; ++i) {
@@ skipping 451 matching lines @@
     ProfileInfo* google_toolbar = new ProfileInfo();
     google_toolbar->browser_type = GOOGLE_TOOLBAR5;
     google_toolbar->description = l10n_util::GetString(
                                   IDS_IMPORT_FROM_GOOGLE_TOOLBAR);
     google_toolbar->source_path.clear();
     google_toolbar->app_path.clear();
     google_toolbar->services_supported = FAVORITES;
     source_profiles_.push_back(google_toolbar);
   }
 }