diff options
author | stevenjb <stevenjb@chromium.org> | 2015-10-27 15:23:10 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-10-27 22:23:52 +0000 |
commit | d50b4910a3c5b388f74fb50bc98587cb59e4e295 (patch) | |
tree | 4b763fcbfff718938c960924f7d0ce1fff940154 /extensions/browser/guest_view | |
parent | 13a3e206698749247fbe53ed5b8eec46002f90a0 (diff) | |
download | chromium_src-d50b4910a3c5b388f74fb50bc98587cb59e4e295.zip chromium_src-d50b4910a3c5b388f74fb50bc98587cb59e4e295.tar.gz chromium_src-d50b4910a3c5b388f74fb50bc98587cb59e4e295.tar.bz2 |
Revert of SSL in EmbeddedTestServer (patchset #55 id:1070001 of https://codereview.chromium.org/1376593007/ )
Reason for revert:
This breaks cros_trunk, failure started here:
http://master.chrome.corp.google.com:8011/builders/cros%20trunk/builds/40350
crbug.com/548358
Original issue's description:
> SSL and add handlers in EmbeddedTestServer
>
> As part of the migration of tests to EmbeddedTestServer, this CL modifies
> EmbeddedTestServer to support SSLServerSocket and to add shared default handlers
> that can be used by tests to mirror the SpawnedTestServer handlers. The major
> changes are:
>
> - SSL support through SSLServerSocket
> - Adding SSLServerConfig to configure SSLServerSockets.
> - Setting up default handlers for BrowserTestBase tests.
> - Asynchronous HttpResponse.
> - Moving EmbeddedTestServer to the net:: namespace.
>
> BUG=496825
> NOPRESUBMIT=TRUE
>
> Committed: https://crrev.com/5c265faa70626b7754e8b62300f65771dae2adbf
> Cr-Commit-Position: refs/heads/master@{#356305}
TBR=davidben@chromium.org,kelvinp@chromium.org,lazyboy@chromium.org,mmenke@chromium.org,asanka@chromium.org,sergeyu@chromium.org,svaldez@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=496825
Review URL: https://codereview.chromium.org/1421903008
Cr-Commit-Position: refs/heads/master@{#356411}
Diffstat (limited to 'extensions/browser/guest_view')
-rw-r--r-- | extensions/browser/guest_view/web_view/web_view_apitest.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/extensions/browser/guest_view/web_view/web_view_apitest.cc b/extensions/browser/guest_view/web_view/web_view_apitest.cc index e4ca00b..5857b73 100644 --- a/extensions/browser/guest_view/web_view/web_view_apitest.cc +++ b/extensions/browser/guest_view/web_view/web_view_apitest.cc @@ -48,6 +48,11 @@ const char kTestServerPort[] = "testServer.port"; const char kTestWebSocketPort[] = "testWebSocketPort"; const char kSitePerProcess[] = "sitePerProcess"; +class EmptyHttpResponse : public net::test_server::HttpResponse { + public: + std::string ToResponseString() const override { return std::string(); } +}; + // Handles |request| by serving a redirect response if the |User-Agent| is // foobar. static scoped_ptr<net::test_server::HttpResponse> UserAgentResponseHandler( @@ -117,8 +122,7 @@ scoped_ptr<net::test_server::HttpResponse> EmptyResponseHandler( const net::test_server::HttpRequest& request) { if (base::StartsWith(path, request.relative_url, base::CompareCase::SENSITIVE)) { - return scoped_ptr<net::test_server::HttpResponse>( - new net::test_server::RawHttpResponse("", "")); + return scoped_ptr<net::test_server::HttpResponse>(new EmptyHttpResponse); } return scoped_ptr<net::test_server::HttpResponse>(); |