importer: Use BaseBookmarkModelObserver on ImporterHost class.

- This makes the class shorter and cleaner.
- Move the overridden methods to the private section.

BUG=None
TEST=existing unit tests.

Review URL: http://codereview.chromium.org/6639005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77413 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 39 insertions, 52 deletions

diff --git a/chrome/browser/importer/importer.cc b/chrome/browser/importer/importer.cc
index 30957fb..4851208 100644
--- a/chrome/browser/importer/importer.cc
+++ b/chrome/browser/importer/importer.cc
@@ -99,28 +99,6 @@ ImporterHost::~ImporterHost() {
   }
 }
 
-void ImporterHost::Loaded(BookmarkModel* model) {
-  DCHECK(model->IsLoaded());
-  model->RemoveObserver(this);
-  waiting_for_bookmarkbar_model_ = false;
-  installed_bookmark_observer_ = false;
-
-  importer_->set_import_to_bookmark_bar(!model->HasBookmarks());
-  InvokeTaskIfDone();
-}
-
-void ImporterHost::BookmarkModelBeingDeleted(BookmarkModel* model) {
-  installed_bookmark_observer_ = false;
-}
-
-void ImporterHost::Observe(NotificationType type,
-                           const NotificationSource& source,
-                           const NotificationDetails& details) {
-  DCHECK(type == NotificationType::TEMPLATE_URL_MODEL_LOADED);
-  registrar_.RemoveAll();
-  InvokeTaskIfDone();
-}
-
 void ImporterHost::ShowWarningDialog() {
   if (headless_) {
     OnLockViewEnd(false);
@@ -227,6 +205,31 @@ void ImporterHost::InvokeTaskIfDone() {
   BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, task_);
 }
 
+void ImporterHost::Loaded(BookmarkModel* model) {
+  DCHECK(model->IsLoaded());
+  model->RemoveObserver(this);
+  waiting_for_bookmarkbar_model_ = false;
+  installed_bookmark_observer_ = false;
+
+  importer_->set_import_to_bookmark_bar(!model->HasBookmarks());
+  InvokeTaskIfDone();
+}
+
+void ImporterHost::BookmarkModelBeingDeleted(BookmarkModel* model) {
+  installed_bookmark_observer_ = false;
+}
+
+void ImporterHost::BookmarkModelChanged() {
+}
+
+void ImporterHost::Observe(NotificationType type,
+                           const NotificationSource& source,
+                           const NotificationDetails& details) {
+  DCHECK(type == NotificationType::TEMPLATE_URL_MODEL_LOADED);
+  registrar_.RemoveAll();
+  InvokeTaskIfDone();
+}
+
 void ImporterHost::ImportItemStarted(importer::ImportItem item) {
   if (observer_)
     observer_->ImportItemStarted(item);
diff --git a/chrome/browser/importer/importer.h b/chrome/browser/importer/importer.h
index b0b5d78..dfae6d8 100644
--- a/chrome/browser/importer/importer.h
+++ b/chrome/browser/importer/importer.h
@@ -10,10 +10,11 @@
 #include <vector>
 
 #include "base/basictypes.h"
+#include "base/compiler_specific.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "build/build_config.h"
-#include "chrome/browser/bookmarks/bookmark_model_observer.h"
+#include "chrome/browser/bookmarks/base_bookmark_model_observer.h"
 #include "chrome/browser/importer/importer_data_types.h"
 #include "chrome/browser/importer/importer_list.h"
 #include "chrome/browser/importer/profile_writer.h"
@@ -50,39 +51,11 @@ struct PasswordForm;
 // browsers dynamically, and controls the process of importing. When
 // the import process is done, ImporterHost deletes itself.
 class ImporterHost : public base::RefCountedThreadSafe<ImporterHost>,
-                     public BookmarkModelObserver,
+                     public BaseBookmarkModelObserver,
                      public NotificationObserver {
  public:
   ImporterHost();
 
-  // BookmarkModelObserver implementation.
-  virtual void Loaded(BookmarkModel* model);
-  virtual void BookmarkNodeMoved(BookmarkModel* model,
-                                 const BookmarkNode* old_parent,
-                                 int old_index,
-                                 const BookmarkNode* new_parent,
-                                 int new_index) {}
-  virtual void BookmarkNodeAdded(BookmarkModel* model,
-                                 const BookmarkNode* parent,
-                                 int index) {}
-  virtual void BookmarkNodeRemoved(BookmarkModel* model,
-                                   const BookmarkNode* parent,
-                                   int old_index,
-                                   const BookmarkNode* node) {}
-  virtual void BookmarkNodeChanged(BookmarkModel* model,
-                                   const BookmarkNode* node) {}
-  virtual void BookmarkNodeChildrenReordered(BookmarkModel* model,
-                                             const BookmarkNode* node) {}
-  virtual void BookmarkNodeFavIconLoaded(BookmarkModel* model,
-                                         const BookmarkNode* node) {}
-  virtual void BookmarkModelBeingDeleted(BookmarkModel* model);
-
-  // NotificationObserver implementation. Called when TemplateURLModel has been
-  // loaded.
-  virtual void Observe(NotificationType type,
-                       const NotificationSource& source,
-                       const NotificationDetails& details);
-
   // ShowWarningDialog() asks user to close the application that is owning the
   // lock. They can retry or skip the importing process.
   void ShowWarningDialog();
@@ -198,6 +171,17 @@ class ImporterHost : public base::RefCountedThreadSafe<ImporterHost>,
   // complete.
   virtual void InvokeTaskIfDone();
 
+  // BaseBookmarkModelObserver:
+  virtual void Loaded(BookmarkModel* model) OVERRIDE;
+  virtual void BookmarkModelBeingDeleted(BookmarkModel* model) OVERRIDE;
+  virtual void BookmarkModelChanged() OVERRIDE;
+
+  // NotificationObserver:
+  // Called when TemplateURLModel has been loaded.
+  virtual void Observe(NotificationType type,
+                       const NotificationSource& source,
+                       const NotificationDetails& details) OVERRIDE;
+
   DISALLOW_COPY_AND_ASSIGN(ImporterHost);
 };