Style cleanup in bookmarks import code

chrome/browser/importer/firefox2_importer.cc

 // Copyright (c) 2011 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/firefox2_importer.h"
 
 #include <string>
 #include <vector>
 
 #include "base/file_path.h"
@@ skipping 312 matching lines @@
                       first_folder_name, this, &bookmarks, &template_urls,
                       &favicons);
 
   // Write data into profile.
   if (!bookmarks.empty() && !cancelled()) {
     int options = 0;
     if (import_to_bookmark_bar())
       options |= ProfileWriter::IMPORT_TO_BOOKMARK_BAR;
     if (bookmark_bar_disabled())
       options |= ProfileWriter::BOOKMARK_BAR_DISABLED;
-    bridge_->AddBookmarkEntries(bookmarks, first_folder_name, options);
+    bridge_->AddBookmarks(bookmarks, first_folder_name, options);
   }
   if (!parsing_bookmarks_html_file_ && !template_urls.empty() &&
       !cancelled()) {
     bridge_->SetKeywords(template_urls, -1, false);
   } else {
     STLDeleteContainerPointers(template_urls.begin(), template_urls.end());
   }
-  if (!favicons.empty()) {
+  if (!favicons.empty())
     bridge_->SetFavicons(favicons);
-  }
 }
 
 void Firefox2Importer::ImportPasswords() {
   // Initializes NSS3.
   NSSDecryptor decryptor;
   if (!decryptor.Init(source_path_, source_path_) &&
       !decryptor.Init(app_path_, source_path_)) {
     return;
   }
 
@@ skipping 326 matching lines @@
 
   // We need to make up a URL for the favicon. We use a version of the page's
   // URL so that we can be sure it will not collide.
   usage.favicon_url = GURL(std::string("made-up-favicon:") + link_url.spec());
 
   // We only have one URL per favicon for Firefox 2 bookmarks.
   usage.urls.insert(link_url);
 
   favicons->push_back(usage);
 }