bookmarks: Simplify BookmarkLoadObserver implementation.

It's easier and simpler to just inherit from BaseBookmarkModelObserver, since
all we care there is about the Loaded() event, nothing more, so we don't have
to have a bunch of empty overrides.

BUG=144783
TEST=unit_tests
R=sky@chromium.org

Review URL: https://codereview.chromium.org/18606002

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

2 files changed, 11 insertions, 29 deletions

diff --git a/chrome/test/base/bookmark_load_observer.cc b/chrome/test/base/bookmark_load_observer.cc
index 3bc1b7f..1fbb7c5 100644
--- a/chrome/test/base/bookmark_load_observer.cc
+++ b/chrome/test/base/bookmark_load_observer.cc
@@ -4,13 +4,13 @@
 
 #include "chrome/test/base/bookmark_load_observer.h"
 
-#include "chrome/test/base/ui_test_utils.h"
-
 BookmarkLoadObserver::BookmarkLoadObserver(const base::Closure& quit_task)
     : quit_task_(quit_task) {}
 
 BookmarkLoadObserver::~BookmarkLoadObserver() {}
 
+void BookmarkLoadObserver::BookmarkModelChanged() {}
+
 void BookmarkLoadObserver::Loaded(BookmarkModel* model, bool ids_reassigned) {
   quit_task_.Run();
 }
diff --git a/chrome/test/base/bookmark_load_observer.h b/chrome/test/base/bookmark_load_observer.h
index adf384e..be15485 100644
--- a/chrome/test/base/bookmark_load_observer.h
+++ b/chrome/test/base/bookmark_load_observer.h
@@ -8,41 +8,23 @@
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
-#include "base/memory/weak_ptr.h"
-#include "chrome/browser/bookmarks/bookmark_model_observer.h"
+#include "chrome/browser/bookmarks/base_bookmark_model_observer.h"
 
-// BookmarkLoadObserver is used when blocking until the BookmarkModel
-// finishes loading. As soon as the BookmarkModel finishes loading the message
-// loop is quit.
-class BookmarkLoadObserver : public BookmarkModelObserver {
+// BookmarkLoadObserver is used when blocking until the BookmarkModel finishes
+// loading. As soon as the BookmarkModel finishes loading the message loop is
+// quit.
+class BookmarkLoadObserver : public BaseBookmarkModelObserver {
  public:
   explicit BookmarkLoadObserver(const base::Closure& quit_task);
   virtual ~BookmarkLoadObserver();
 
+ private:
+  // BaseBookmarkModelObserver:
+  virtual void BookmarkModelChanged() OVERRIDE;
   virtual void Loaded(BookmarkModel* model, bool ids_reassigned) OVERRIDE;
-  virtual void BookmarkNodeMoved(BookmarkModel* model,
-                                 const BookmarkNode* old_parent,
-                                 int old_index,
-                                 const BookmarkNode* new_parent,
-                                 int new_index) OVERRIDE {}
-  virtual void BookmarkNodeAdded(BookmarkModel* model,
-                                 const BookmarkNode* parent,
-                                 int index)  OVERRIDE{}
-  virtual void BookmarkNodeRemoved(BookmarkModel* model,
-                                   const BookmarkNode* parent,
-                                   int old_index,
-                                   const BookmarkNode* node) OVERRIDE {}
-  virtual void BookmarkAllNodesRemoved(BookmarkModel* model) OVERRIDE {}
-  virtual void BookmarkNodeChanged(BookmarkModel* model,
-                                   const BookmarkNode* node) OVERRIDE {}
-  virtual void BookmarkNodeChildrenReordered(
-      BookmarkModel* model,
-      const BookmarkNode* node) OVERRIDE {}
-  virtual void BookmarkNodeFaviconChanged(BookmarkModel* model,
-                                          const BookmarkNode* node) OVERRIDE {}
 
- private:
   base::Closure quit_task_;
+
   DISALLOW_COPY_AND_ASSIGN(BookmarkLoadObserver);
 };