| Index: chrome/browser/sessions/better_session_restore_browsertest.cc
|
| diff --git a/chrome/browser/sessions/better_session_restore_browsertest.cc b/chrome/browser/sessions/better_session_restore_browsertest.cc
|
| index 096c6375b7aeedb58de4f379feb98f57ad8da599..17695fd43227478c0d5c7bfa290417288b5f3550 100644
|
| --- a/chrome/browser/sessions/better_session_restore_browsertest.cc
|
| +++ b/chrome/browser/sessions/better_session_restore_browsertest.cc
|
| @@ -680,7 +680,7 @@ IN_PROC_BROWSER_TEST_F(NoSessionRestoreTest, PRE_SessionCookies) {
|
| IN_PROC_BROWSER_TEST_F(NoSessionRestoreTest, SessionCookies) {
|
| content::WebContents* web_contents =
|
| browser()->tab_strip_model()->GetActiveWebContents();
|
| - EXPECT_EQ(std::string(content::kAboutBlankURL),
|
| + EXPECT_EQ(std::string(url::kAboutBlankURL),
|
| web_contents->GetURL().spec());
|
| // When we navigate to the page again, it doens't see the data previously
|
| // stored.
|
| @@ -694,7 +694,7 @@ IN_PROC_BROWSER_TEST_F(NoSessionRestoreTest, PRE_SessionStorage) {
|
| IN_PROC_BROWSER_TEST_F(NoSessionRestoreTest, SessionStorage) {
|
| content::WebContents* web_contents =
|
| browser()->tab_strip_model()->GetActiveWebContents();
|
| - EXPECT_EQ(std::string(content::kAboutBlankURL),
|
| + EXPECT_EQ(std::string(url::kAboutBlankURL),
|
| web_contents->GetURL().spec());
|
| StoreDataWithPage("session_storage.html");
|
| }
|
| @@ -708,7 +708,7 @@ IN_PROC_BROWSER_TEST_F(NoSessionRestoreTest, PRE_LocalStorageClearedOnExit) {
|
| // Normally localStorage is persisted.
|
| content::WebContents* web_contents =
|
| browser()->tab_strip_model()->GetActiveWebContents();
|
| - EXPECT_EQ(std::string(content::kAboutBlankURL),
|
| + EXPECT_EQ(std::string(url::kAboutBlankURL),
|
| web_contents->GetURL().spec());
|
| NavigateAndCheckStoredData("local_storage.html");
|
| // ... but not if it's set to clear on exit.
|
| @@ -719,7 +719,7 @@ IN_PROC_BROWSER_TEST_F(NoSessionRestoreTest, PRE_LocalStorageClearedOnExit) {
|
| IN_PROC_BROWSER_TEST_F(NoSessionRestoreTest, LocalStorageClearedOnExit) {
|
| content::WebContents* web_contents =
|
| browser()->tab_strip_model()->GetActiveWebContents();
|
| - EXPECT_EQ(std::string(content::kAboutBlankURL),
|
| + EXPECT_EQ(std::string(url::kAboutBlankURL),
|
| web_contents->GetURL().spec());
|
| StoreDataWithPage("local_storage.html");
|
| }
|
| @@ -732,7 +732,7 @@ IN_PROC_BROWSER_TEST_F(NoSessionRestoreTest, PRE_CookiesClearedOnExit) {
|
| // Normally cookies are restored.
|
| content::WebContents* web_contents =
|
| browser()->tab_strip_model()->GetActiveWebContents();
|
| - EXPECT_EQ(std::string(content::kAboutBlankURL),
|
| + EXPECT_EQ(std::string(url::kAboutBlankURL),
|
| web_contents->GetURL().spec());
|
| NavigateAndCheckStoredData("cookies.html");
|
| // ... but not if the content setting is set to clear on exit.
|
| @@ -743,7 +743,7 @@ IN_PROC_BROWSER_TEST_F(NoSessionRestoreTest, PRE_CookiesClearedOnExit) {
|
| IN_PROC_BROWSER_TEST_F(NoSessionRestoreTest, CookiesClearedOnExit) {
|
| content::WebContents* web_contents =
|
| browser()->tab_strip_model()->GetActiveWebContents();
|
| - EXPECT_EQ(std::string(content::kAboutBlankURL),
|
| + EXPECT_EQ(std::string(url::kAboutBlankURL),
|
| web_contents->GetURL().spec());
|
| StoreDataWithPage("local_storage.html");
|
| }
|
|
|