summaryrefslogtreecommitdiffstats
path: root/chrome/browser/autocomplete/autocomplete_browsertest.cc
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-01 12:31:34 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-01 12:31:34 +0000
commite19cf1e973a77089f45935fc3f960aba91890373 (patch)
tree8b1e8ecb09278b5ae708d246685a852dc62dfb6f /chrome/browser/autocomplete/autocomplete_browsertest.cc
parente87d0813680968941a8be73cc0a22881237fdbce (diff)
downloadchromium_src-e19cf1e973a77089f45935fc3f960aba91890373.zip
chromium_src-e19cf1e973a77089f45935fc3f960aba91890373.tar.gz
chromium_src-e19cf1e973a77089f45935fc3f960aba91890373.tar.bz2
Implement policy for enabling/disabling browsing history.
BUG=none TEST=none Review URL: http://codereview.chromium.org/3432033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61169 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete/autocomplete_browsertest.cc')
-rw-r--r--chrome/browser/autocomplete/autocomplete_browsertest.cc9
1 files changed, 1 insertions, 8 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_browsertest.cc b/chrome/browser/autocomplete/autocomplete_browsertest.cc
index 5ef296b..744db3e 100644
--- a/chrome/browser/autocomplete/autocomplete_browsertest.cc
+++ b/chrome/browser/autocomplete/autocomplete_browsertest.cc
@@ -64,13 +64,6 @@ 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->BackendLoaded())
- ui_test_utils::WaitForNotification(NotificationType::HISTORY_LOADED);
- }
};
IN_PROC_BROWSER_TEST_F(AutocompleteBrowserTest, MAYBE_Basic) {
@@ -114,7 +107,7 @@ IN_PROC_BROWSER_TEST_F(AutocompleteBrowserTest, MAYBE_Basic) {
IN_PROC_BROWSER_TEST_F(AutocompleteBrowserTest, MAYBE_Autocomplete) {
// The results depend on the history backend being loaded. Make sure it is
// loaded so that the autocomplete results are consistent.
- WaitForHistoryBackendToLoad();
+ ui_test_utils::WaitForHistoryToLoad(browser());
LocationBar* location_bar = GetLocationBar();
AutocompleteController* autocomplete_controller = GetAutocompleteController();