From 2667d63b5cfe019c906024ea85c63abfc89d888b Mon Sep 17 00:00:00 2001
From: "phajdan.jr@chromium.org"
<phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Thu, 24 Sep 2009 23:56:03 +0000
Subject: [PATCH] Wait for the history backend to load, which makes
AutocompleteBrowserTest.Autocomplete not flaky.
TEST=Covered by browser_tests.
BUG=19876
Review URL: http://codereview.chromium.org/218038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27147 0039d316-1c4b-4281-b951-d872f2087c98
---
.../autocomplete/autocomplete_browsertest.cc | 31 ++++++++++++++++++-
1 file changed, 30 insertions(+), 1 deletion(-)
diff --git a/chrome/browser/autocomplete/autocomplete_browsertest.cc b/chrome/browser/autocomplete/autocomplete_browsertest.cc
index 7af31cb32c4b6..403a2598cb446 100644
--- a/chrome/browser/autocomplete/autocomplete_browsertest.cc
+++ b/chrome/browser/autocomplete/autocomplete_browsertest.cc
@@ -8,7 +8,12 @@
#include "chrome/browser/autocomplete/autocomplete_popup_model.h"
#include "chrome/browser/browser.h"
#include "chrome/browser/browser_window.h"
+#include "chrome/browser/history/history.h"
#include "chrome/browser/location_bar.h"
+#include "chrome/browser/profile.h"
+#include "chrome/common/notification_registrar.h"
+#include "chrome/common/notification_service.h"
+#include "chrome/common/notification_type.h"
#include "chrome/common/url_constants.h"
#include "chrome/test/in_process_browser_test.h"
#include "chrome/test/ui_test_utils.h"
@@ -30,7 +35,8 @@ std::wstring AutocompleteResultAsString(const AutocompleteResult& result) {
} // namespace
-class AutocompleteBrowserTest : public InProcessBrowserTest {
+class AutocompleteBrowserTest : public InProcessBrowserTest,
+ public NotificationObserver {
protected:
LocationBar* GetLocationBar() const {
return browser()->window()->GetLocationBar();
@@ -40,6 +46,25 @@ class AutocompleteBrowserTest : public InProcessBrowserTest {
return GetLocationBar()->location_entry()->model()->popup_model()->
autocomplete_controller();
}
+
+ void WaitForHistoryBackendToLoad() {
+ HistoryService* history_service =
+ browser()->profile()->GetHistoryService(Profile::EXPLICIT_ACCESS);
+ if (!history_service->backend_loaded()) {
+ NotificationRegistrar registrar;
+ registrar.Add(this, NotificationType::HISTORY_LOADED,
+ NotificationService::AllSources());
+ ui_test_utils::RunMessageLoop();
+ }
+ }
+
+ virtual void Observe(NotificationType type,
+ const NotificationSource& source,
+ const NotificationDetails& details) {
+ DCHECK(type == NotificationType::HISTORY_LOADED);
+ MessageLoop::current()->Quit();
+ }
+
};
IN_PROC_BROWSER_TEST_F(AutocompleteBrowserTest, Basic) {
@@ -81,6 +106,10 @@ IN_PROC_BROWSER_TEST_F(AutocompleteBrowserTest, Basic) {
}
IN_PROC_BROWSER_TEST_F(AutocompleteBrowserTest, Autocomplete) {
+ // The results depend on the history backend being loaded. Make sure it is
+ // loaded so that the autocomplete results are consistent.
+ WaitForHistoryBackendToLoad();
+
LocationBar* location_bar = GetLocationBar();
AutocompleteController* autocomplete_controller = GetAutocompleteController();
--
GitLab