| Index: chrome/browser/captive_portal/captive_portal_browsertest.cc
|
| diff --git a/chrome/browser/captive_portal/captive_portal_browsertest.cc b/chrome/browser/captive_portal/captive_portal_browsertest.cc
|
| index d591c36e193ce287652286609557022942f07a90..413b12f1008df51128e33c4b5a4e775a51f5b8d0 100644
|
| --- a/chrome/browser/captive_portal/captive_portal_browsertest.cc
|
| +++ b/chrome/browser/captive_portal/captive_portal_browsertest.cc
|
| @@ -1319,7 +1319,7 @@ void CaptivePortalBrowserTest::NavigateLoginTab(Browser* browser,
|
| // Do the navigation.
|
| content::RenderViewHost* render_view_host =
|
| tab_strip_model->GetActiveWebContents()->GetRenderViewHost();
|
| - render_view_host->ExecuteJavascriptInWebFrame(string16(),
|
| + render_view_host->ExecuteJavascriptInWebFrame(base::string16(),
|
| ASCIIToUTF16("submitForm()"));
|
|
|
| portal_observer.WaitForResults(1);
|
| @@ -1367,7 +1367,7 @@ void CaptivePortalBrowserTest::Login(Browser* browser,
|
| // Trigger a navigation.
|
| content::RenderViewHost* render_view_host =
|
| tab_strip_model->GetActiveWebContents()->GetRenderViewHost();
|
| - render_view_host->ExecuteJavascriptInWebFrame(string16(),
|
| + render_view_host->ExecuteJavascriptInWebFrame(base::string16(),
|
| ASCIIToUTF16("submitForm()"));
|
|
|
| portal_observer.WaitForResults(1);
|
| @@ -1722,7 +1722,7 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, SSLCertErrorLogin) {
|
| content::RenderViewHost* render_view_host =
|
| tab_strip_model->GetActiveWebContents()->GetRenderViewHost();
|
| render_view_host->ExecuteJavascriptInWebFrame(
|
| - string16(),
|
| + base::string16(),
|
| ASCIIToUTF16("submitForm()"));
|
|
|
| // The captive portal tab navigation will trigger a captive portal check,
|
|
|