| Index: net/url_request/url_request_unittest.h
|
| ===================================================================
|
| --- net/url_request/url_request_unittest.h (revision 31079)
|
| +++ net/url_request/url_request_unittest.h (working copy)
|
| @@ -63,7 +63,8 @@
|
| proxy_service_, ssl_config_service_);
|
| }
|
|
|
| - virtual ~TestURLRequestContext() {
|
| + protected:
|
| + ~TestURLRequestContext() {
|
| delete http_transaction_factory_;
|
| }
|
| };
|
| @@ -244,8 +245,6 @@
|
| : launcher_(connection_attempts, connection_timeout) { }
|
|
|
| public:
|
| - virtual ~BaseTestServer() { }
|
| -
|
| void set_forking(bool forking) {
|
| launcher_.set_forking(forking);
|
| }
|
| @@ -295,6 +294,9 @@
|
| }
|
|
|
| protected:
|
| + friend class base::RefCounted<BaseTestServer>;
|
| + virtual ~BaseTestServer() { }
|
| +
|
| bool Start(net::TestServerLauncher::Protocol protocol,
|
| const std::string& host_name, int port,
|
| const FilePath& document_root,
|
| @@ -356,6 +358,8 @@
|
| : BaseTestServer(connection_attempts, connection_timeout), loop_(NULL) {
|
| }
|
|
|
| + virtual ~HTTPTestServer() {}
|
| +
|
| public:
|
| // Creates and returns a new HTTPTestServer. If |loop| is non-null, requests
|
| // are serviced on it, otherwise a new thread and message loop are created.
|
| @@ -560,11 +564,11 @@
|
| return test_server;
|
| }
|
|
|
| - virtual ~HTTPSTestServer() {
|
| - }
|
| -
|
| protected:
|
| std::wstring cert_path_;
|
| +
|
| + private:
|
| + virtual ~HTTPSTestServer() {}
|
| };
|
|
|
|
|
| @@ -600,6 +604,9 @@
|
|
|
| return true;
|
| }
|
| +
|
| + private:
|
| + ~FTPTestServer() {}
|
| };
|
|
|
| #endif // NET_URL_REQUEST_URL_REQUEST_UNITTEST_H_
|
|
|