diff options
| author | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-30 23:29:54 +0000 |
|---|---|---|
| committer | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-30 23:29:54 +0000 |
| commit | 5d9c52a60b5e91819c2664572a6e0ef343a3ea28 (patch) | |
| tree | 30406e4c144cf8d036a4ef1e4dabebcc1b6a8e05 /webkit/glue | |
| parent | 997c8ca739b3f79ff76adbbf421c7056af8ccdcb (diff) | |
| download | chromium_src-5d9c52a60b5e91819c2664572a6e0ef343a3ea28.zip chromium_src-5d9c52a60b5e91819c2664572a6e0ef343a3ea28.tar.gz chromium_src-5d9c52a60b5e91819c2664572a6e0ef343a3ea28.tar.bz2 | |
Revert 7508.7509 and 7510
Review URL: http://codereview.chromium.org/17030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7514 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
| -rw-r--r-- | webkit/glue/mimetype_unittest.cc | 12 | ||||
| -rw-r--r-- | webkit/glue/resource_fetcher_unittest.cc | 19 | ||||
| -rw-r--r-- | webkit/glue/unittest_test_server.h | 18 |
3 files changed, 17 insertions, 32 deletions
diff --git a/webkit/glue/mimetype_unittest.cc b/webkit/glue/mimetype_unittest.cc index a746d96..bbbf0f6 100644 --- a/webkit/glue/mimetype_unittest.cc +++ b/webkit/glue/mimetype_unittest.cc @@ -23,7 +23,7 @@ class MimeTypeTests : public TestShellTest { test_shell_->LoadURL(UTF8ToWide(url.spec()).c_str()); test_shell_->WaitTestFinished(); } - + void CheckMimeType(const char* mimetype, const std::wstring& expected) { std::string path("contenttype?"); GURL url = server_->TestServerPage(path + mimetype); @@ -31,17 +31,16 @@ class MimeTypeTests : public TestShellTest { WebFrame* frame = test_shell_->webView()->GetMainFrame(); EXPECT_EQ(expected, webkit_glue::DumpDocumentText(frame)); } - - scoped_refptr<UnittestTestServer> server_; + + scoped_ptr<UnittestTestServer> server_; }; TEST_F(MimeTypeTests, MimeTypeTests) { - server_ = UnittestTestServer::CreateServer(); - ASSERT_TRUE(NULL != server_.get()); + server_.reset(new UnittestTestServer); std::wstring expected_src(L"<html>\n<body>\n" L"<p>HTML text</p>\n</body>\n</html>\n"); - + // These files should all be displayed as plain text. const char* plain_text[] = { "text/css", @@ -81,6 +80,7 @@ TEST_F(MimeTypeTests, MimeTypeTests) { // TODO(tc): make sure other mime types properly go to download (e.g., // image/foo). + server_.reset(NULL); } } // namespace diff --git a/webkit/glue/resource_fetcher_unittest.cc b/webkit/glue/resource_fetcher_unittest.cc index 81d9646..d996f3b 100644 --- a/webkit/glue/resource_fetcher_unittest.cc +++ b/webkit/glue/resource_fetcher_unittest.cc @@ -153,16 +153,14 @@ FetcherDelegate* FetcherDelegate::instance_ = NULL; // Test a fetch from the test server. TEST_F(ResourceFetcherTests, ResourceFetcherDownload) { - scoped_refptr<UnittestTestServer> server = - UnittestTestServer::CreateServer(); - ASSERT_TRUE(NULL != server.get()); + UnittestTestServer server; WebFrame* web_frame = test_shell_->webView()->GetMainFrame(); // Not safe, but this is a unittest, so whatever. WebFrameImpl* web_frame_impl = reinterpret_cast<WebFrameImpl*>(web_frame); WebCore::Frame* frame = web_frame_impl->frame(); - GURL url = server->TestServerPage("files/test_shell/index.html"); + GURL url = server.TestServerPage("files/test_shell/index.html"); scoped_ptr<FetcherDelegate> delegate(new FetcherDelegate); scoped_ptr<ResourceFetcher> fetcher(new ResourceFetcher( url, frame, delegate.get())); @@ -175,7 +173,7 @@ TEST_F(ResourceFetcherTests, ResourceFetcherDownload) { EXPECT_TRUE(text.find("What is this page?") != std::string::npos); // Test 404 response. - url = server->TestServerPage("files/thisfiledoesntexist.html"); + url = server.TestServerPage("files/thisfiledoesntexist.html"); delegate.reset(new FetcherDelegate); fetcher.reset(new ResourceFetcher(url, frame, delegate.get())); @@ -187,10 +185,7 @@ TEST_F(ResourceFetcherTests, ResourceFetcherDownload) { } TEST_F(ResourceFetcherTests, ResourceFetcherDidFail) { - scoped_refptr<UnittestTestServer> server = - UnittestTestServer::CreateServer(); - ASSERT_TRUE(NULL != server.get()); - + UnittestTestServer server; WebFrame* web_frame = test_shell_->webView()->GetMainFrame(); // Not safe, but this is a unittest, so whatever. WebFrameImpl* web_frame_impl = reinterpret_cast<WebFrameImpl*>(web_frame); @@ -213,9 +208,7 @@ TEST_F(ResourceFetcherTests, ResourceFetcherDidFail) { } TEST_F(ResourceFetcherTests, ResourceFetcherTimeout) { - scoped_refptr<UnittestTestServer> server = - UnittestTestServer::CreateServer(); - ASSERT_TRUE(NULL != server.get()); + UnittestTestServer server; WebFrame* web_frame = test_shell_->webView()->GetMainFrame(); // Not safe, but this is a unittest, so whatever. @@ -224,7 +217,7 @@ TEST_F(ResourceFetcherTests, ResourceFetcherTimeout) { // Grab a page that takes at least 1 sec to respond, but set the fetcher to // timeout in 0 sec. - GURL url = server->TestServerPage("slow?1"); + GURL url = server.TestServerPage("slow?1"); scoped_ptr<FetcherDelegate> delegate(new FetcherDelegate); scoped_ptr<ResourceFetcher> fetcher(new ResourceFetcherWithTimeout( url, frame, 0, delegate.get())); diff --git a/webkit/glue/unittest_test_server.h b/webkit/glue/unittest_test_server.h index 3e27b875..d9b4ce2 100644 --- a/webkit/glue/unittest_test_server.h +++ b/webkit/glue/unittest_test_server.h @@ -14,22 +14,14 @@ using webkit_glue::ResourceLoaderBridge; // We need to use ResourceLoaderBridge to communicate with the testserver // instead of using URLRequest directly because URLRequests need to be run on // the test_shell's IO thread. -class UnittestTestServer : public HTTPTestServer { - protected: - UnittestTestServer() { - } - +class UnittestTestServer : public TestServer { public: - static UnittestTestServer* CreateServer() { - UnittestTestServer* test_server = new UnittestTestServer(); - if (!test_server->Init("localhost", 1337, L"webkit/data")) { - delete test_server; - return NULL; - } - return test_server; + UnittestTestServer() : TestServer(TestServer::ManualInit()) { + Init("localhost", 1337, L"webkit/data", std::wstring()); } - virtual ~UnittestTestServer() { + ~UnittestTestServer() { + Shutdown(); } virtual bool MakeGETRequest(const std::string& page_name) { |