diff options
| author | sky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-02 22:06:44 +0000 |
|---|---|---|
| committer | sky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-02 22:06:44 +0000 |
| commit | 729065e3cfedd4db3db21d4b485527be2eff4d3e (patch) | |
| tree | b4d58c0608b129b67555ba62dcc7f45d2fed5f4c /chrome/browser/views/bookmark_bar_view_test.cc | |
| parent | 493c0a196a653dd6ead30a8cc8e45df54ca3b997 (diff) | |
| download | chromium_src-729065e3cfedd4db3db21d4b485527be2eff4d3e.zip chromium_src-729065e3cfedd4db3db21d4b485527be2eff4d3e.tar.gz chromium_src-729065e3cfedd4db3db21d4b485527be2eff4d3e.tar.bz2 | |
Moves the bookmark bar view test into the interactive tests. To get
this to work I changed the interactive ui tests to link with
everything the unit tests do. I did this by way of clicking on the
dependencies dialog in VS. Let me know if that wasn't right. I also
had to slightly tweak BookmarkBarModel and BookmarkStorage to deal
with changes I did a while back. These changes only matter during
testing (background thread is NULL).
BUG=1318942
TEST=none
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1659 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/bookmark_bar_view_test.cc')
| -rw-r--r-- | chrome/browser/views/bookmark_bar_view_test.cc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/chrome/browser/views/bookmark_bar_view_test.cc b/chrome/browser/views/bookmark_bar_view_test.cc index b6571c6..ca24a3b 100644 --- a/chrome/browser/views/bookmark_bar_view_test.cc +++ b/chrome/browser/views/bookmark_bar_view_test.cc @@ -11,7 +11,7 @@ #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "chrome/test/testing_profile.h" -#include "chrome/test/ui/view_event_test_base.h" +#include "chrome/test/interactive_ui/view_event_test_base.h" #include "chrome/views/chrome_menu.h" #include "chrome/views/text_button.h" #include "chrome/views/window.h" @@ -334,8 +334,6 @@ class BookmarkBarViewTest3 : public BookmarkBarViewEventTestBase { // Hide menu. menu->GetMenuController()->Cancel(true); - // Because of the nested loop run by the menu we need to invoke done twice. - Done(); Done(); } }; @@ -390,8 +388,6 @@ class BookmarkBarViewTest4 : public BookmarkBarViewEventTestBase { ASSERT_TRUE(navigator_.url_ == model_->other_node()->GetChild(0)->GetURL()); - // Because of the nested loop we invoke done twice here. - Done(); Done(); } }; @@ -831,4 +827,3 @@ class BookmarkBarViewTest10 : public BookmarkBarViewEventTestBase { }; VIEW_TEST(BookmarkBarViewTest10, KeyEvents) - |