Style cleanup in bookmarks import code

chrome/browser/importer/profile_writer.h

 // 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.
 
 #ifndef CHROME_BROWSER_IMPORTER_PROFILE_WRITER_H_
 #define CHROME_BROWSER_IMPORTER_PROFILE_WRITER_H_
 #pragma once
 
 #include <vector>
 
@@ skipping 15 matching lines @@
 #if defined(OS_WIN)
 struct IE7PasswordInfo;
 #endif
 
 // ProfileWriter encapsulates profile for writing entries into it.
 // This object must be invoked on UI thread.
 class ProfileWriter : public base::RefCountedThreadSafe<ProfileWriter> {
  public:
   // Used to identify how the bookmarks are added.
   enum BookmarkOptions {
-    // Indicates the bookmark should only be added if unique. Uniqueness
-    // is done by title, url and path. That is, if this is passed to
-    // AddBookmarkEntry the bookmark is added only if there is no other
-    // URL with the same url, path and title.
+    // Indicates the bookmark should only be added if unique. Uniqueness is done
+    // by title, url and path. That is, if this is passed to AddBookmarks, the
+    // bookmark is added only if there is no other URL with the same url, path
+    // and title.
     ADD_IF_UNIQUE = 1 << 0,
 
     // Indicates the bookmarks should be added to the bookmark bar.
     IMPORT_TO_BOOKMARK_BAR = 1 << 1,
 
     // Indicates the bookmark bar is not shown.
     BOOKMARK_BAR_DISABLED = 1 << 2
   };
 
   struct BookmarkEntry {
@@ skipping 33 matching lines @@
   // which bookmarks are added. If the bitmask contains IMPORT_TO_BOOKMARK_BAR,
   // then any entries with a value of true for in_toolbar are added to
   // the bookmark bar. If the bitmask does not contain IMPORT_TO_BOOKMARK_BAR
   // then the folder name the bookmarks are added to is uniqued based on
   // |first_folder_name|. For example, if |first_folder_name| is 'foo'
   // and a folder with the name 'foo' already exists in the other
   // bookmarks folder, then the folder name 'foo 2' is used.
   // If |options| contains ADD_IF_UNIQUE, then the bookmark is added only
   // if another bookmarks does not exist with the same title, path and
   // url.
-  virtual void AddBookmarkEntry(const std::vector<BookmarkEntry>& bookmark,
-                                const string16& first_folder_name,
-                                int options);
+  virtual void AddBookmarks(const std::vector<BookmarkEntry>& bookmark,
+                            const string16& first_folder_name,
+                            int options);
 
   virtual void AddFavicons(
       const std::vector<history::ImportedFaviconUsage>& favicons);
 
   // Add the TemplateURLs in |template_urls| to the local store and make the
   // TemplateURL at |default_keyword_index| the default keyword (does not set
   // a default keyword if it is -1).  The local store becomes the owner of the
   // TemplateURLs.  Some TemplateURLs in |template_urls| may conflict (same
   // keyword or same host name in the URL) with existing TemplateURLs in the
   // local store, in which case the existing ones takes precedence and the
@@ skipping 27 matching lines @@
                          const BookmarkEntry& entry,
                          const string16& first_folder_name,
                          bool import_to_bookmark_bar);
 
   Profile* const profile_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileWriter);
 };
 
 #endif  // CHROME_BROWSER_IMPORTER_PROFILE_WRITER_H_