Index: chrome/browser/history/history_browsertest.cc |
=================================================================== |
--- chrome/browser/history/history_browsertest.cc (revision 149452) |
+++ chrome/browser/history/history_browsertest.cc (working copy) |
@@ -158,11 +158,13 @@ |
IN_PROC_BROWSER_TEST_F(HistoryBrowserTest, SavingHistoryEnabled) { |
EXPECT_FALSE(GetPrefs()->GetBoolean(prefs::kSavingBrowserHistoryDisabled)); |
- EXPECT_TRUE(GetProfile()->GetHistoryService(Profile::EXPLICIT_ACCESS)); |
- EXPECT_TRUE(GetProfile()->GetHistoryService(Profile::IMPLICIT_ACCESS)); |
+ EXPECT_TRUE(HistoryServiceFactory::GetForProfile( |
+ GetProfile(), Profile::EXPLICIT_ACCESS)); |
+ EXPECT_TRUE(HistoryServiceFactory::GetForProfile( |
+ GetProfile(), Profile::IMPLICIT_ACCESS)); |
- ui_test_utils::WaitForHistoryToLoad( |
- browser()->profile()->GetHistoryService(Profile::EXPLICIT_ACCESS)); |
+ ui_test_utils::WaitForHistoryToLoad(HistoryServiceFactory::GetForProfile( |
+ browser()->profile(), Profile::EXPLICIT_ACCESS)); |
ExpectEmptyHistory(); |
ui_test_utils::NavigateToURL(browser(), GetTestUrl()); |
@@ -179,11 +181,13 @@ |
IN_PROC_BROWSER_TEST_F(HistoryBrowserTest, SavingHistoryDisabled) { |
GetPrefs()->SetBoolean(prefs::kSavingBrowserHistoryDisabled, true); |
- EXPECT_TRUE(GetProfile()->GetHistoryService(Profile::EXPLICIT_ACCESS)); |
- EXPECT_FALSE(GetProfile()->GetHistoryService(Profile::IMPLICIT_ACCESS)); |
+ EXPECT_TRUE(HistoryServiceFactory::GetForProfile( |
+ GetProfile(), Profile::EXPLICIT_ACCESS)); |
+ EXPECT_FALSE(HistoryServiceFactory::GetForProfile( |
+ GetProfile(), Profile::IMPLICIT_ACCESS)); |
- ui_test_utils::WaitForHistoryToLoad( |
- browser()->profile()->GetHistoryService(Profile::EXPLICIT_ACCESS)); |
+ ui_test_utils::WaitForHistoryToLoad(HistoryServiceFactory::GetForProfile( |
+ browser()->profile(), Profile::EXPLICIT_ACCESS)); |
ExpectEmptyHistory(); |
ui_test_utils::NavigateToURL(browser(), GetTestUrl()); |
@@ -196,8 +200,8 @@ |
IN_PROC_BROWSER_TEST_F(HistoryBrowserTest, SavingHistoryEnabledThenDisabled) { |
EXPECT_FALSE(GetPrefs()->GetBoolean(prefs::kSavingBrowserHistoryDisabled)); |
- ui_test_utils::WaitForHistoryToLoad( |
- browser()->profile()->GetHistoryService(Profile::EXPLICIT_ACCESS)); |
+ ui_test_utils::WaitForHistoryToLoad(HistoryServiceFactory::GetForProfile( |
+ browser()->profile(), Profile::EXPLICIT_ACCESS)); |
ui_test_utils::NavigateToURL(browser(), GetTestUrl()); |
WaitForHistoryBackendToRun(); |
@@ -226,8 +230,8 @@ |
IN_PROC_BROWSER_TEST_F(HistoryBrowserTest, SavingHistoryDisabledThenEnabled) { |
GetPrefs()->SetBoolean(prefs::kSavingBrowserHistoryDisabled, true); |
- ui_test_utils::WaitForHistoryToLoad( |
- browser()->profile()->GetHistoryService(Profile::EXPLICIT_ACCESS)); |
+ ui_test_utils::WaitForHistoryToLoad(HistoryServiceFactory::GetForProfile( |
+ browser()->profile(), Profile::EXPLICIT_ACCESS)); |
ExpectEmptyHistory(); |
ui_test_utils::NavigateToURL(browser(), GetTestUrl()); |