Index: chrome/browser/ui/search/search_tab_helper_unittest.cc |
diff --git a/chrome/browser/ui/search/search_tab_helper_unittest.cc b/chrome/browser/ui/search/search_tab_helper_unittest.cc |
index 4f4506d0aa4572a78b6967575d8431c328b406fe..0abd72a7909b6d3266ae85fcb4764dad3aef5d24 100644 |
--- a/chrome/browser/ui/search/search_tab_helper_unittest.cc |
+++ b/chrome/browser/ui/search/search_tab_helper_unittest.cc |
@@ -294,8 +294,8 @@ TEST_F(SearchTabHelperWindowTest, OnProvisionalLoadFailRedirectNTPToLocal) { |
// A failed provisional load of a cacheable NTP should be redirected to local |
// NTP. |
const GURL cacheableNTPURL = chrome::GetNewTabPageURL(profile()); |
- search_tab_helper->DidFailProvisionalLoad(1, string16(), true, |
- cacheableNTPURL, 1, string16(), NULL); |
+ search_tab_helper->DidFailProvisionalLoad(1, base::string16(), true, |
+ cacheableNTPURL, 1, base::string16(), NULL); |
CommitPendingLoad(controller); |
EXPECT_EQ(GURL(chrome::kChromeSearchLocalNtpUrl), |
controller->GetLastCommittedEntry()->GetURL()); |
@@ -314,8 +314,8 @@ TEST_F(SearchTabHelperWindowTest, OnProvisionalLoadFailDontRedirectIfAborted) { |
// A failed provisional load of a cacheable NTP should be redirected to local |
// NTP. |
const GURL cacheableNTPURL = chrome::GetNewTabPageURL(profile()); |
- search_tab_helper->DidFailProvisionalLoad(1, string16(), true, |
- cacheableNTPURL, net::ERR_ABORTED, string16(), NULL); |
+ search_tab_helper->DidFailProvisionalLoad(1, base::string16(), true, |
+ cacheableNTPURL, net::ERR_ABORTED, base::string16(), NULL); |
CommitPendingLoad(controller); |
EXPECT_EQ(GURL("chrome://blank"), |
controller->GetLastCommittedEntry()->GetURL()); |
@@ -332,8 +332,8 @@ TEST_F(SearchTabHelperWindowTest, OnProvisionalLoadFailDontRedirectNonNTP) { |
ASSERT_NE(static_cast<SearchTabHelper*>(NULL), search_tab_helper); |
// Any other web page shouldn't be redirected when provisional load fails. |
- search_tab_helper->DidFailProvisionalLoad(1, string16(), true, |
- GURL("http://www.example.com"), 1, string16(), NULL); |
+ search_tab_helper->DidFailProvisionalLoad(1, base::string16(), true, |
+ GURL("http://www.example.com"), 1, base::string16(), NULL); |
CommitPendingLoad(controller); |
EXPECT_NE(GURL(chrome::kChromeSearchLocalNtpUrl), |
controller->GetLastCommittedEntry()->GetURL()); |