Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(227)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/captive_portal/captive_portal_tab_helper_unittest.cc

Issue 105193002: Replace string16 with base::string16. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/captive_portal/captive_portal_tab_helper.cc ('k') | chrome/browser/certificate_manager_model.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/captive_portal/captive_portal_tab_helper_unittest.cc
diff --git a/chrome/browser/captive_portal/captive_portal_tab_helper_unittest.cc b/chrome/browser/captive_portal/captive_portal_tab_helper_unittest.cc
index c4c156d9df4c6625e2117e621a7527975dd9f194..02653eda8b1a0862615fca8ded0f915da76d176f 100644
--- a/chrome/browser/captive_portal/captive_portal_tab_helper_unittest.cc
+++ b/chrome/browser/captive_portal/captive_portal_tab_helper_unittest.cc
@@ -91,7 +91,7 @@ class CaptivePortalTabHelperTest : public ChromeRenderViewHostTestHarness {
EXPECT_CALL(mock_reloader(), OnLoadCommitted(net::OK)).Times(1);
tab_helper().DidCommitProvisionalLoadForFrame(
- 1, string16(), true, url, content::PAGE_TRANSITION_LINK,
+ 1, base::string16(), true, url, content::PAGE_TRANSITION_LINK,
render_view_host);
}
@@ -103,7 +103,7 @@ class CaptivePortalTabHelperTest : public ChromeRenderViewHostTestHarness {
1, -1, true, url, false, false, render_view_host);
tab_helper().DidFailProvisionalLoad(
- 1, string16(), true, url, net::ERR_TIMED_OUT, string16(),
+ 1, base::string16(), true, url, net::ERR_TIMED_OUT, base::string16(),
render_view_host);
// Provisional load starts for the error page.
@@ -112,8 +112,8 @@ class CaptivePortalTabHelperTest : public ChromeRenderViewHostTestHarness {
EXPECT_CALL(mock_reloader(), OnLoadCommitted(net::ERR_TIMED_OUT)).Times(1);
tab_helper().DidCommitProvisionalLoadForFrame(
- 1, string16(), true, GURL(kErrorPageUrl), content::PAGE_TRANSITION_LINK,
- render_view_host);
+ 1, base::string16(), true, GURL(kErrorPageUrl),
+ content::PAGE_TRANSITION_LINK, render_view_host);
}
// Simulates an abort while requesting |url|.
@@ -127,7 +127,7 @@ class CaptivePortalTabHelperTest : public ChromeRenderViewHostTestHarness {
EXPECT_CALL(mock_reloader(), OnAbort()).Times(1);
if (navigation_type == kSameProcess) {
tab_helper().DidFailProvisionalLoad(
- 1, string16(), true, url, net::ERR_ABORTED, string16(),
+ 1, base::string16(), true, url, net::ERR_ABORTED, base::string16(),
render_view_host);
} else {
// For interrupted provisional cross-process navigations, the
@@ -150,7 +150,7 @@ class CaptivePortalTabHelperTest : public ChromeRenderViewHostTestHarness {
1, -1, true, url, false, false, render_view_host);
tab_helper().DidFailProvisionalLoad(
- 1, string16(), true, url, net::ERR_TIMED_OUT, string16(),
+ 1, base::string16(), true, url, net::ERR_TIMED_OUT, base::string16(),
render_view_host);
// Start event for the error page.
@@ -160,7 +160,7 @@ class CaptivePortalTabHelperTest : public ChromeRenderViewHostTestHarness {
EXPECT_CALL(mock_reloader(), OnAbort()).Times(1);
if (navigation_type == kSameProcess) {
tab_helper().DidFailProvisionalLoad(
- 1, string16(), true, url, net::ERR_ABORTED, string16(),
+ 1, base::string16(), true, url, net::ERR_ABORTED, base::string16(),
render_view_host);
} else {
// For interrupted provisional cross-process navigations, the
@@ -249,8 +249,8 @@ TEST_F(CaptivePortalTabHelperTest, HttpTimeoutLinkDoctor) {
EXPECT_CALL(mock_reloader(), OnLoadCommitted(net::OK)).Times(1);
tab_helper().DidCommitProvisionalLoadForFrame(
- 1, string16(), true, GURL(kErrorPageUrl), content::PAGE_TRANSITION_LINK,
- render_view_host1());
+ 1, base::string16(), true, GURL(kErrorPageUrl),
+ content::PAGE_TRANSITION_LINK, render_view_host1());
tab_helper().DidStopLoading(render_view_host1());
}
@@ -332,13 +332,13 @@ TEST_F(CaptivePortalTabHelperTest, UnexpectedProvisionalLoad) {
// The cross-process navigation fails.
tab_helper().DidFailProvisionalLoad(
- 1, string16(), true, cross_process_url, net::ERR_FAILED, string16(),
- render_view_host2());
+ 1, base::string16(), true, cross_process_url, net::ERR_FAILED,
+ base::string16(), render_view_host2());
// The same-site navigation finally is aborted.
tab_helper().DidFailProvisionalLoad(
- 1, string16(), true, same_site_url, net::ERR_ABORTED, string16(),
- render_view_host1());
+ 1, base::string16(), true, same_site_url, net::ERR_ABORTED,
+ base::string16(), render_view_host1());
// The provisional load starts for the error page for the cross-process
// navigation.
@@ -347,8 +347,8 @@ TEST_F(CaptivePortalTabHelperTest, UnexpectedProvisionalLoad) {
EXPECT_CALL(mock_reloader(), OnLoadCommitted(net::ERR_FAILED)).Times(1);
tab_helper().DidCommitProvisionalLoadForFrame(
- 1, string16(), true, GURL(kErrorPageUrl), content::PAGE_TRANSITION_TYPED,
- render_view_host2());
+ 1, base::string16(), true, GURL(kErrorPageUrl),
+ content::PAGE_TRANSITION_TYPED, render_view_host2());
}
// Similar to the above test, except the original RenderViewHost manages to
@@ -374,7 +374,8 @@ TEST_F(CaptivePortalTabHelperTest, UnexpectedCommit) {
// The cross-process navigation fails.
tab_helper().DidFailProvisionalLoad(
- 1, string16(), true, cross_process_url, net::ERR_FAILED, string16(),
+ 1, base::string16(), true, cross_process_url, net::ERR_FAILED,
+ base::string16(),
render_view_host2());
// The same-site navigation succeeds.
@@ -383,7 +384,7 @@ TEST_F(CaptivePortalTabHelperTest, UnexpectedCommit) {
OnLoadStart(same_site_url.SchemeIsSecure())).Times(1);
EXPECT_CALL(mock_reloader(), OnLoadCommitted(net::OK)).Times(1);
tab_helper().DidCommitProvisionalLoadForFrame(
- 1, string16(), true, same_site_url, content::PAGE_TRANSITION_LINK,
+ 1, base::string16(), true, same_site_url, content::PAGE_TRANSITION_LINK,
render_view_host1());
}
@@ -395,26 +396,26 @@ TEST_F(CaptivePortalTabHelperTest, HttpsSubframe) {
tab_helper().DidStartProvisionalLoadForFrame(
1, -1, false, url, false, false, render_view_host1());
tab_helper().DidCommitProvisionalLoadForFrame(
- 1, string16(), false, url, content::PAGE_TRANSITION_LINK,
+ 1, base::string16(), false, url, content::PAGE_TRANSITION_LINK,
render_view_host1());
// Timeout.
tab_helper().DidStartProvisionalLoadForFrame(
2, -1, false, url, false, false, render_view_host1());
tab_helper().DidFailProvisionalLoad(
- 2, string16(), false, url, net::ERR_TIMED_OUT, string16(),
+ 2, base::string16(), false, url, net::ERR_TIMED_OUT, base::string16(),
render_view_host1());
tab_helper().DidStartProvisionalLoadForFrame(
2, -1, false, url, true, false, render_view_host1());
tab_helper().DidFailProvisionalLoad(
- 2, string16(), false, url, net::ERR_ABORTED, string16(),
+ 2, base::string16(), false, url, net::ERR_ABORTED, base::string16(),
render_view_host1());
// Abort.
tab_helper().DidStartProvisionalLoadForFrame(
3, -1, false, url, false, false, render_view_host1());
tab_helper().DidFailProvisionalLoad(
- 3, string16(), false, url, net::ERR_ABORTED, string16(),
+ 3, base::string16(), false, url, net::ERR_ABORTED, base::string16(),
render_view_host1());
}
@@ -437,11 +438,11 @@ TEST_F(CaptivePortalTabHelperTest, HttpsSubframeParallelError) {
// Loads return errors.
tab_helper().DidFailProvisionalLoad(
- frame_id, string16(), true, url, net::ERR_UNEXPECTED, string16(),
- render_view_host1());
+ frame_id, base::string16(), true, url, net::ERR_UNEXPECTED,
+ base::string16(), render_view_host1());
tab_helper().DidFailProvisionalLoad(
- subframe_id, string16(), false, url, net::ERR_TIMED_OUT, string16(),
- render_view_host1());
+ subframe_id, base::string16(), false, url, net::ERR_TIMED_OUT,
+ base::string16(), render_view_host1());
// Provisional load starts for the error pages.
tab_helper().DidStartProvisionalLoadForFrame(
@@ -451,11 +452,11 @@ TEST_F(CaptivePortalTabHelperTest, HttpsSubframeParallelError) {
// Error page load finishes.
tab_helper().DidCommitProvisionalLoadForFrame(
- subframe_id, string16(), false, url,
+ subframe_id, base::string16(), false, url,
content::PAGE_TRANSITION_AUTO_SUBFRAME, render_view_host1());
EXPECT_CALL(mock_reloader(), OnLoadCommitted(net::ERR_UNEXPECTED)).Times(1);
tab_helper().DidCommitProvisionalLoadForFrame(
- frame_id, string16(), true, url, content::PAGE_TRANSITION_LINK,
+ frame_id, base::string16(), true, url, content::PAGE_TRANSITION_LINK,
render_view_host1());
}
@@ -472,8 +473,8 @@ TEST_F(CaptivePortalTabHelperTest, HttpToHttpsRedirectTimeout) {
render_view_host1()->GetProcess()->GetID());
tab_helper().DidFailProvisionalLoad(
- 1, string16(), true, https_url, net::ERR_TIMED_OUT, string16(),
- render_view_host1());
+ 1, base::string16(), true, https_url, net::ERR_TIMED_OUT,
+ base::string16(), render_view_host1());
// Provisional load starts for the error page.
tab_helper().DidStartProvisionalLoadForFrame(
@@ -481,8 +482,8 @@ TEST_F(CaptivePortalTabHelperTest, HttpToHttpsRedirectTimeout) {
EXPECT_CALL(mock_reloader(), OnLoadCommitted(net::ERR_TIMED_OUT)).Times(1);
tab_helper().DidCommitProvisionalLoadForFrame(
- 1, string16(), true, GURL(kErrorPageUrl), content::PAGE_TRANSITION_LINK,
- render_view_host1());
+ 1, base::string16(), true, GURL(kErrorPageUrl),
+ content::PAGE_TRANSITION_LINK, render_view_host1());
}
// Simulates an HTTPS to HTTP redirect.
@@ -500,7 +501,7 @@ TEST_F(CaptivePortalTabHelperTest, HttpsToHttpRedirect) {
EXPECT_CALL(mock_reloader(), OnLoadCommitted(net::OK)).Times(1);
tab_helper().DidCommitProvisionalLoadForFrame(
- 1, string16(), true, http_url, content::PAGE_TRANSITION_LINK,
+ 1, base::string16(), true, http_url, content::PAGE_TRANSITION_LINK,
render_view_host1());
}
@@ -518,7 +519,7 @@ TEST_F(CaptivePortalTabHelperTest, HttpToHttpRedirect) {
EXPECT_CALL(mock_reloader(), OnLoadCommitted(net::OK)).Times(1);
tab_helper().DidCommitProvisionalLoadForFrame(
- 1, string16(), true, http_url, content::PAGE_TRANSITION_LINK,
+ 1, base::string16(), true, http_url, content::PAGE_TRANSITION_LINK,
render_view_host1());
}
@@ -535,8 +536,8 @@ TEST_F(CaptivePortalTabHelperTest, SubframeRedirect) {
EXPECT_CALL(mock_reloader(), OnLoadCommitted(net::OK)).Times(1);
tab_helper().DidCommitProvisionalLoadForFrame(
- 1, string16(), true, GURL(kErrorPageUrl), content::PAGE_TRANSITION_LINK,
- render_view_host1());
+ 1, base::string16(), true, GURL(kErrorPageUrl),
+ content::PAGE_TRANSITION_LINK, render_view_host1());
}
// Simulates a redirect, for another RenderViewHost.
@@ -553,8 +554,8 @@ TEST_F(CaptivePortalTabHelperTest, OtherRenderViewHostRedirect) {
render_view_host2()->GetProcess()->GetID());
tab_helper().DidFailProvisionalLoad(
- 1, string16(), true, https_url, net::ERR_TIMED_OUT, string16(),
- render_view_host1());
+ 1, base::string16(), true, https_url, net::ERR_TIMED_OUT,
+ base::string16(), render_view_host1());
// Provisional load starts for the error page.
tab_helper().DidStartProvisionalLoadForFrame(
@@ -562,8 +563,8 @@ TEST_F(CaptivePortalTabHelperTest, OtherRenderViewHostRedirect) {
EXPECT_CALL(mock_reloader(), OnLoadCommitted(net::ERR_TIMED_OUT)).Times(1);
tab_helper().DidCommitProvisionalLoadForFrame(
- 1, string16(), true, GURL(kErrorPageUrl), content::PAGE_TRANSITION_LINK,
- render_view_host1());
+ 1, base::string16(), true, GURL(kErrorPageUrl),
+ content::PAGE_TRANSITION_LINK, render_view_host1());
}
TEST_F(CaptivePortalTabHelperTest, LoginTabLogin) {
« no previous file with comments | « chrome/browser/captive_portal/captive_portal_tab_helper.cc ('k') | chrome/browser/certificate_manager_model.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698