diff options
| author | sky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-16 18:46:25 +0000 |
|---|---|---|
| committer | sky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-16 18:46:25 +0000 |
| commit | d65e942e2191a9c57085374fc02b3230a55bdc81 (patch) | |
| tree | bd5bde2fbee788d761419964e7b45a658830234d | |
| parent | 6d1f0db178b618e02b5c27f4ad99eed6f94f5685 (diff) | |
| download | chromium_src-d65e942e2191a9c57085374fc02b3230a55bdc81.zip chromium_src-d65e942e2191a9c57085374fc02b3230a55bdc81.tar.gz chromium_src-d65e942e2191a9c57085374fc02b3230a55bdc81.tar.bz2 | |
Reverts r7062 as caused failures on interactive tests.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7068 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/bookmarks/bookmark_model.h | 6 | ||||
| -rw-r--r-- | chrome/browser/views/bookmark_bar_view_test.cc | 1 |
2 files changed, 0 insertions, 7 deletions
diff --git a/chrome/browser/bookmarks/bookmark_model.h b/chrome/browser/bookmarks/bookmark_model.h index 332e599..675405b 100644 --- a/chrome/browser/bookmarks/bookmark_model.h +++ b/chrome/browser/bookmarks/bookmark_model.h @@ -284,12 +284,6 @@ class BookmarkModel : public NotificationObserver, public BookmarkService { Profile* profile() const { return profile_; } - - // Sets the BookmarkStorage. This is intended for testing. - void set_store(BookmarkStorage* store) { - store_ = store; - } - private: // Used to order BookmarkNodes by URL. class NodeURLComparator { diff --git a/chrome/browser/views/bookmark_bar_view_test.cc b/chrome/browser/views/bookmark_bar_view_test.cc index 0ab25db..8d31eb1 100644 --- a/chrome/browser/views/bookmark_bar_view_test.cc +++ b/chrome/browser/views/bookmark_bar_view_test.cc @@ -78,7 +78,6 @@ class BookmarkBarViewEventTestBase : public ViewEventTestBase { profile_->GetPrefs()->SetBoolean(prefs::kShowBookmarkBar, true); model_ = profile_->GetBookmarkModel(); - model_->set_store(NULL); bb_view_ = new BookmarkBarView(profile_.get(), NULL); bb_view_->SetPageNavigator(&navigator_); |