diff options
| author | dank@chromium.org <dank@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-26 22:47:26 +0000 |
|---|---|---|
| committer | dank@chromium.org <dank@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-26 22:47:26 +0000 |
| commit | e03b3477198cc99ab43e501b782710749ba2478e (patch) | |
| tree | a065af6f26a6ea653bea8fbc6126c73ec98479e6 /net/url_request | |
| parent | cbc636789f8cbfa17cd28abe0dee0e5fba75a112 (diff) | |
| download | chromium_src-e03b3477198cc99ab43e501b782710749ba2478e.zip chromium_src-e03b3477198cc99ab43e501b782710749ba2478e.tar.gz chromium_src-e03b3477198cc99ab43e501b782710749ba2478e.tar.bz2 | |
Roll back r6063. TBR.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6067 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/url_request')
| -rw-r--r-- | net/url_request/url_request_unittest.cc | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc index df7b98b..05686e6 100644 --- a/net/url_request/url_request_unittest.cc +++ b/net/url_request/url_request_unittest.cc @@ -4,13 +4,9 @@ #include "net/url_request/url_request_unittest.h" -#include "build/build_config.h" - #if defined(OS_WIN) #include <windows.h> #include <shlobj.h> -#elif defined(OS_LINUX) -#include "base/nss_init.h" #endif #include <algorithm> @@ -22,12 +18,10 @@ #include "base/process_util.h" #include "base/string_piece.h" #include "base/string_util.h" -#include "base/trace_event.h" #include "net/base/load_flags.h" #include "net/base/net_errors.h" #include "net/base/net_module.h" #include "net/base/net_util.h" -#include "net/base/ssl_test_util.h" #include "net/disk_cache/disk_cache.h" #include "net/http/http_cache.h" #include "net/http/http_network_layer.h" @@ -122,41 +116,6 @@ TEST_F(URLRequestTest, GetTest) { #endif } -class HTTPSRequestTest : public testing::Test { - protected: - SSLTestUtil util_; -}; - -#if defined(OS_MACOSX) -// TODO(port): support temporary root cert on mac -#define MAYBE_HTTPSGetTest DISABLED_HTTPSGetTest -#else -#define MAYBE_HTTPSGetTest HTTPSGetTest -#endif - -TEST_F(HTTPSRequestTest, MAYBE_HTTPSGetTest) { - base::TraceLog::StartTracing(); - HTTPSTestServer https_server(util_.kHostName, util_.kOKHTTPSPort, - util_.kDocRoot, util_.GetOKCertPath()); - - TestDelegate d; - { - TestURLRequest r(https_server.TestServerPage(""), &d); - - r.Start(); - EXPECT_TRUE(r.is_pending()); - - MessageLoop::current()->Run(); - - EXPECT_EQ(1, d.response_started_count()); - EXPECT_FALSE(d.received_data_before_response()); - EXPECT_NE(0, d.bytes_received()); - } -#ifndef NDEBUG - DCHECK_EQ(url_request_metrics.object_count,0); -#endif -} - TEST_F(URLRequestTest, CancelTest) { TestDelegate d; { |