diff options
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/autocomplete/autocomplete_browsertest.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/history/history_browsertest.cc | 12 |
2 files changed, 12 insertions, 6 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_browsertest.cc b/chrome/browser/autocomplete/autocomplete_browsertest.cc index f9058c7..f5c1962 100644 --- a/chrome/browser/autocomplete/autocomplete_browsertest.cc +++ b/chrome/browser/autocomplete/autocomplete_browsertest.cc @@ -102,7 +102,8 @@ IN_PROC_BROWSER_TEST_F(AutocompleteBrowserTest, 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. - ui_test_utils::WaitForHistoryToLoad(browser()); + ui_test_utils::WaitForHistoryToLoad( + browser()->profile()->GetHistoryService(Profile::EXPLICIT_ACCESS)); LocationBar* location_bar = GetLocationBar(); AutocompleteController* autocomplete_controller = GetAutocompleteController(); @@ -264,7 +265,8 @@ IN_PROC_BROWSER_TEST_F(AutocompleteBrowserTest, ExtensionAppProvider) { // The results depend on the history backend being loaded. Make sure it is // loaded so that the autocomplete results are consistent. - ui_test_utils::WaitForHistoryToLoad(browser()); + ui_test_utils::WaitForHistoryToLoad( + browser()->profile()->GetHistoryService(Profile::EXPLICIT_ACCESS)); AutocompleteController* autocomplete_controller = GetAutocompleteController(); diff --git a/chrome/browser/history/history_browsertest.cc b/chrome/browser/history/history_browsertest.cc index 84d3c49..3934cee 100644 --- a/chrome/browser/history/history_browsertest.cc +++ b/chrome/browser/history/history_browsertest.cc @@ -157,7 +157,8 @@ IN_PROC_BROWSER_TEST_F(HistoryBrowserTest, SavingHistoryEnabled) { EXPECT_TRUE(GetProfile()->GetHistoryService(Profile::EXPLICIT_ACCESS)); EXPECT_TRUE(GetProfile()->GetHistoryService(Profile::IMPLICIT_ACCESS)); - ui_test_utils::WaitForHistoryToLoad(browser()); + ui_test_utils::WaitForHistoryToLoad( + browser()->profile()->GetHistoryService(Profile::EXPLICIT_ACCESS)); ExpectEmptyHistory(); ui_test_utils::NavigateToURL(browser(), GetTestUrl()); @@ -177,7 +178,8 @@ IN_PROC_BROWSER_TEST_F(HistoryBrowserTest, SavingHistoryDisabled) { EXPECT_TRUE(GetProfile()->GetHistoryService(Profile::EXPLICIT_ACCESS)); EXPECT_FALSE(GetProfile()->GetHistoryService(Profile::IMPLICIT_ACCESS)); - ui_test_utils::WaitForHistoryToLoad(browser()); + ui_test_utils::WaitForHistoryToLoad( + browser()->profile()->GetHistoryService(Profile::EXPLICIT_ACCESS)); ExpectEmptyHistory(); ui_test_utils::NavigateToURL(browser(), GetTestUrl()); @@ -190,7 +192,8 @@ IN_PROC_BROWSER_TEST_F(HistoryBrowserTest, SavingHistoryDisabled) { IN_PROC_BROWSER_TEST_F(HistoryBrowserTest, SavingHistoryEnabledThenDisabled) { EXPECT_FALSE(GetPrefs()->GetBoolean(prefs::kSavingBrowserHistoryDisabled)); - ui_test_utils::WaitForHistoryToLoad(browser()); + ui_test_utils::WaitForHistoryToLoad( + browser()->profile()->GetHistoryService(Profile::EXPLICIT_ACCESS)); ui_test_utils::NavigateToURL(browser(), GetTestUrl()); WaitForHistoryBackendToRun(); @@ -219,7 +222,8 @@ IN_PROC_BROWSER_TEST_F(HistoryBrowserTest, SavingHistoryEnabledThenDisabled) { IN_PROC_BROWSER_TEST_F(HistoryBrowserTest, SavingHistoryDisabledThenEnabled) { GetPrefs()->SetBoolean(prefs::kSavingBrowserHistoryDisabled, true); - ui_test_utils::WaitForHistoryToLoad(browser()); + ui_test_utils::WaitForHistoryToLoad( + browser()->profile()->GetHistoryService(Profile::EXPLICIT_ACCESS)); ExpectEmptyHistory(); ui_test_utils::NavigateToURL(browser(), GetTestUrl()); |