From f72a1ccce08050ede3d1e46cbbcd9cf5b3a1c236 Mon Sep 17 00:00:00 2001 From: "phajdan.jr@chromium.org" Date: Fri, 30 Apr 2010 07:17:30 +0000 Subject: Remove deprecated things from net test suite: - URLRequestTestContext (from now on use TestURLRequestContext) - TestServerPageW (use TestServerPage). TEST=none BUG=none Review URL: http://codereview.chromium.org/1814002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46044 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/tab_contents/view_source_uitest.cc | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'chrome/browser/tab_contents') diff --git a/chrome/browser/tab_contents/view_source_uitest.cc b/chrome/browser/tab_contents/view_source_uitest.cc index aec2b25..9a19ac4 100644 --- a/chrome/browser/tab_contents/view_source_uitest.cc +++ b/chrome/browser/tab_contents/view_source_uitest.cc @@ -14,8 +14,7 @@ const wchar_t kDocRoot[] = L"chrome/test/data"; class ViewSourceTest : public UITest { protected: - ViewSourceTest() : UITest() { - test_html_ = L"files/viewsource/test.html"; + ViewSourceTest() : test_html_("files/viewsource/test.html") { } bool IsPageMenuCommandEnabled(int command) { @@ -30,7 +29,7 @@ class ViewSourceTest : public UITest { } protected: - std::wstring test_html_; + std::string test_html_; }; // This test renders a page in view-source and then checks to see if a cookie @@ -44,7 +43,7 @@ TEST_F(ViewSourceTest, DoesBrowserRenderInViewSource) { std::string cookie_data = "foo"; // First we navigate to our view-source test page - GURL url = server->TestServerPageW(test_html_); + GURL url = server->TestServerPage(test_html_); url = GURL("view-source:" + url.spec()); scoped_refptr tab(GetActiveTab()); ASSERT_TRUE(tab.get()); @@ -67,7 +66,7 @@ TEST_F(ViewSourceTest, DoesBrowserConsumeViewSourcePrefix) { ASSERT_TRUE(NULL != server.get()); // First we navigate to google.html - GURL url = server->TestServerPageW(test_html_); + GURL url = server->TestServerPage(test_html_); NavigateToURL(url); // Then we navigate to the SAME url but with the view-source: prefix @@ -86,7 +85,7 @@ TEST_F(ViewSourceTest, ViewSourceInPageMenuEnabledOnANormalPage) { ASSERT_TRUE(NULL != server.get()); // First we navigate to google.html - GURL url = server->TestServerPageW(test_html_); + GURL url = server->TestServerPage(test_html_); NavigateToURL(url); EXPECT_TRUE(IsPageMenuCommandEnabled(IDC_VIEW_SOURCE)); @@ -100,7 +99,7 @@ TEST_F(ViewSourceTest, ViewSourceInPageMenuDisabledWhileViewingSource) { ASSERT_TRUE(NULL != server.get()); // First we navigate to google.html - GURL url = server->TestServerPageW(test_html_); + GURL url = server->TestServerPage(test_html_); GURL url_viewsource = GURL("view-source:" + url.spec()); NavigateToURL(url_viewsource); -- cgit v1.1