diff options
| author | sky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-16 17:51:56 +0000 |
|---|---|---|
| committer | sky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-16 17:51:56 +0000 |
| commit | 9559b4f8127d66640a54a3d0f5f423c3bfc5171b (patch) | |
| tree | eb3754d6dd4ba0b6c4451af6701de8e424abd759 /chrome | |
| parent | 29d02e5544e7ff4e70c631d72891f1509abe6f41 (diff) | |
| download | chromium_src-9559b4f8127d66640a54a3d0f5f423c3bfc5171b.zip chromium_src-9559b4f8127d66640a54a3d0f5f423c3bfc5171b.tar.gz chromium_src-9559b4f8127d66640a54a3d0f5f423c3bfc5171b.tar.bz2 | |
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/14449
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7062 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -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, 7 insertions, 0 deletions
diff --git a/chrome/browser/bookmarks/bookmark_model.h b/chrome/browser/bookmarks/bookmark_model.h index 675405b..332e599 100644 --- a/chrome/browser/bookmarks/bookmark_model.h +++ b/chrome/browser/bookmarks/bookmark_model.h @@ -284,6 +284,12 @@ 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 8d31eb1..0ab25db 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_->set_store(NULL); bb_view_ = new BookmarkBarView(profile_.get(), NULL); bb_view_->SetPageNavigator(&navigator_); |