diff options
| author | sky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-16 20:42:25 +0000 |
|---|---|---|
| committer | sky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-16 20:42:25 +0000 |
| commit | 9876bb1ca6bcd92032ee0b0d79065bf0fb8b2d8a (patch) | |
| tree | 3a0ddda30270a357496589d45cf40a596d966655 /chrome | |
| parent | aff7d1eedc285ee2c60c087e01475efb51c660b3 (diff) | |
| download | chromium_src-9876bb1ca6bcd92032ee0b0d79065bf0fb8b2d8a.zip chromium_src-9876bb1ca6bcd92032ee0b0d79065bf0fb8b2d8a.tar.gz chromium_src-9876bb1ca6bcd92032ee0b0d79065bf0fb8b2d8a.tar.bz2 | |
Attempt 2 at this. This differs from first version in that I renamed
set_store to ClearStore and properly remove an observer I added. And I'm
disabling a test that needs more investigation.
Makes the interactive bookmark bar view tests faster by disabling
saving. This is why BookmarkBarViewTest9 keeps timing out.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/14471
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7091 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/bookmarks/bookmark_model.cc | 8 | ||||
| -rw-r--r-- | chrome/browser/bookmarks/bookmark_model.h | 5 | ||||
| -rw-r--r-- | chrome/browser/views/bookmark_bar_view_test.cc | 3 |
3 files changed, 15 insertions, 1 deletions
diff --git a/chrome/browser/bookmarks/bookmark_model.cc b/chrome/browser/bookmarks/bookmark_model.cc index dd4b1fb..afb42df 100644 --- a/chrome/browser/bookmarks/bookmark_model.cc +++ b/chrome/browser/bookmarks/bookmark_model.cc @@ -321,6 +321,14 @@ void BookmarkModel::ResetDateGroupModified(BookmarkNode* node) { SetDateGroupModified(node, Time()); } +void BookmarkModel::ClearStore() { + if (profile_ && store_.get()) { + NotificationService::current()->RemoveObserver( + this, NOTIFY_FAVICON_CHANGED, Source<Profile>(profile_)); + } + store_ = NULL; +} + bool BookmarkModel::IsBookmarkedNoLock(const GURL& url) { BookmarkNode tmp_node(this, url); return (nodes_ordered_by_url_set_.find(&tmp_node) != diff --git a/chrome/browser/bookmarks/bookmark_model.h b/chrome/browser/bookmarks/bookmark_model.h index 675405b..6f33274 100644 --- a/chrome/browser/bookmarks/bookmark_model.h +++ b/chrome/browser/bookmarks/bookmark_model.h @@ -284,6 +284,11 @@ class BookmarkModel : public NotificationObserver, public BookmarkService { Profile* profile() const { return profile_; } + // Sets the store to NULL, making it so the BookmarkModel does not persist + // any changes to disk. This is only useful during testing to speed up + // testing. + void ClearStore(); + 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 8d31eb1..2477929 100644 --- a/chrome/browser/views/bookmark_bar_view_test.cc +++ b/chrome/browser/views/bookmark_bar_view_test.cc @@ -78,6 +78,7 @@ class BookmarkBarViewEventTestBase : public ViewEventTestBase { profile_->GetPrefs()->SetBoolean(prefs::kShowBookmarkBar, true); model_ = profile_->GetBookmarkModel(); + model_->ClearStore(); bb_view_ = new BookmarkBarView(profile_.get(), NULL); bb_view_->SetPageNavigator(&navigator_); @@ -958,4 +959,4 @@ class BookmarkBarViewTest12 : public BookmarkBarViewEventTestBase { } }; -VIEW_TEST(BookmarkBarViewTest12, CloseWithModalDialog) +VIEW_TEST(BookmarkBarViewTest12, DISABLED_CloseWithModalDialog) |