diff options
| author | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-25 16:00:10 +0000 |
|---|---|---|
| committer | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-25 16:00:10 +0000 |
| commit | fa13583bee02fb9e2b02c7d761bfb291e9035abc (patch) | |
| tree | a3b14450eae3e1673e77ad1bad05c85e958ed940 /content/browser/session_history_browsertest.cc | |
| parent | 45c56d58e1fa736d57fb8bc9deaed44123386ade (diff) | |
| download | chromium_src-fa13583bee02fb9e2b02c7d761bfb291e9035abc.zip chromium_src-fa13583bee02fb9e2b02c7d761bfb291e9035abc.tar.gz chromium_src-fa13583bee02fb9e2b02c7d761bfb291e9035abc.tar.bz2 | |
Revert 202112 "GTTF: Convert most tests in content to use Embedd..."
> GTTF: Convert most tests in content to use EmbeddedTestServer.
>
> This eliminates a whole class of problems with SpawnedTestServer
> failing to start.
>
> BUG=96594
> R=avi@chromium.org, satorux@chromium.org
>
> Review URL: https://codereview.chromium.org/15505003
TBR=phajdan.jr@chromium.org
Review URL: https://codereview.chromium.org/15846017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202303 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/session_history_browsertest.cc')
| -rw-r--r-- | content/browser/session_history_browsertest.cc | 37 |
1 files changed, 3 insertions, 34 deletions
diff --git a/content/browser/session_history_browsertest.cc b/content/browser/session_history_browsertest.cc index d8a24ef..b2698b9d 100644 --- a/content/browser/session_history_browsertest.cc +++ b/content/browser/session_history_browsertest.cc @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/stringprintf.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "content/public/browser/navigation_controller.h" @@ -15,43 +14,17 @@ #include "content/shell/shell.h" #include "content/test/content_browser_test.h" #include "content/test/content_browser_test_utils.h" -#include "net/test/embedded_test_server/embedded_test_server.h" -#include "net/test/embedded_test_server/http_response.h" -#include "net/test/embedded_test_server/http_request.h" +#include "net/test/spawned_test_server/spawned_test_server.h" #include "testing/gtest/include/gtest/gtest.h" namespace content { -namespace { - -// Handles |request| by serving a response with title set to request contents. -scoped_ptr<net::test_server::HttpResponse> HandleEchoTitleRequest( - const std::string& echotitle_path, - const net::test_server::HttpRequest& request) { - if (!StartsWithASCII(request.relative_url, echotitle_path, true)) - return scoped_ptr<net::test_server::HttpResponse>(NULL); - - scoped_ptr<net::test_server::BasicHttpResponse> http_response( - new net::test_server::BasicHttpResponse); - http_response->set_code(net::test_server::SUCCESS); - http_response->set_content( - base::StringPrintf( - "<html><head><title>%s</title></head></html>", - request.content.c_str())); - return http_response.PassAs<net::test_server::HttpResponse>(); -} - -} // namespace - class SessionHistoryTest : public ContentBrowserTest { protected: SessionHistoryTest() {} virtual void SetUpOnMainThread() OVERRIDE { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); - embedded_test_server()->RegisterRequestHandler( - base::Bind(&HandleEchoTitleRequest, "/echotitle")); - + ASSERT_TRUE(test_server()->Start()); NavigateToURL(shell(), GURL(kAboutBlankURL)); } @@ -93,8 +66,7 @@ class SessionHistoryTest : public ContentBrowserTest { } GURL GetURL(const std::string file) { - return embedded_test_server()->GetURL( - std::string("/session_history/") + file); + return test_server()->GetURL(std::string("files/session_history/") + file); } void NavigateAndCheckTitle(const char* filename, @@ -325,9 +297,6 @@ IN_PROC_BROWSER_TEST_F(SessionHistoryTest, CrossFrameFormBackForward) { // navigations. Bug 730379. // If this flakes use http://crbug.com/61619. IN_PROC_BROWSER_TEST_F(SessionHistoryTest, FragmentBackForward) { - embedded_test_server()->RegisterRequestHandler( - base::Bind(&HandleEchoTitleRequest, "/echotitle")); - ASSERT_FALSE(CanGoBack()); GURL fragment(GetURL("fragment.html")); |