diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-27 01:32:41 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-27 01:32:41 +0000 |
| commit | 7b46c8f2c598b53bd5169cf33430fe329cc44d31 (patch) | |
| tree | bce50f8b6c0dff66c6a816d513437370513b314f /chrome | |
| parent | fc9c69bfe3d6ba66526f07777f6ce3ef55ee6500 (diff) | |
| download | chromium_src-7b46c8f2c598b53bd5169cf33430fe329cc44d31.zip chromium_src-7b46c8f2c598b53bd5169cf33430fe329cc44d31.tar.gz chromium_src-7b46c8f2c598b53bd5169cf33430fe329cc44d31.tar.bz2 | |
assure model is loaded *before* showing the bookmark manager
Review URL: http://codereview.chromium.org/173554
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24581 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/gtk/bookmark_manager_browsertest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/gtk/bookmark_manager_browsertest.cc b/chrome/browser/gtk/bookmark_manager_browsertest.cc index 611bf27..485a661d 100644 --- a/chrome/browser/gtk/bookmark_manager_browsertest.cc +++ b/chrome/browser/gtk/bookmark_manager_browsertest.cc @@ -18,16 +18,16 @@ class BookmarkManagerTest : public InProcessBrowserTest, void Init() { model_ = browser()->profile()->GetBookmarkModel(); - BookmarkManagerGtk::Show(browser()->profile()); - manager_ = BookmarkManagerGtk::GetCurrentManager(); - ASSERT_TRUE(manager_); - if (!model_->IsLoaded()) { model_->AddObserver(this); ui_test_utils::RunMessageLoop(); model_->RemoveObserver(this); } ASSERT_TRUE(model_->IsLoaded()); + + BookmarkManagerGtk::Show(browser()->profile()); + manager_ = BookmarkManagerGtk::GetCurrentManager(); + ASSERT_TRUE(manager_); } void CleanUp() { |