| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef CHROME_FRAME_TEST_HTTP_SERVER_H_ | 5 #ifndef CHROME_FRAME_TEST_HTTP_SERVER_H_ |
| 6 #define CHROME_FRAME_TEST_HTTP_SERVER_H_ | 6 #define CHROME_FRAME_TEST_HTTP_SERVER_H_ |
| 7 | 7 |
| 8 #include <windows.h> | 8 #include <windows.h> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| 11 #include "googleurl/src/gurl.h" | 11 #include "googleurl/src/gurl.h" |
| 12 #include "base/ref_counted.h" | 12 #include "base/ref_counted.h" |
| 13 #include "net/url_request/url_request_unittest.h" | 13 #include "net/test/test_server.h" |
| 14 | 14 |
| 15 class FilePath; | 15 class FilePath; |
| 16 | 16 |
| 17 // Chrome Frame specilization of http server from net. | 17 // Chrome Frame specilization of http server from net. |
| 18 class ChromeFrameHTTPServer { | 18 class ChromeFrameHTTPServer { |
| 19 public: | 19 public: |
| 20 void SetUp(); | 20 void SetUp(); |
| 21 void TearDown(); | 21 void TearDown(); |
| 22 bool WaitToFinish(int milliseconds); | 22 bool WaitToFinish(int milliseconds); |
| 23 GURL Resolve(const wchar_t* relative_url); | 23 GURL Resolve(const wchar_t* relative_url); |
| 24 FilePath GetDataDir(); | 24 FilePath GetDataDir(); |
| 25 | 25 |
| 26 HTTPTestServer* server() { return server_; } | 26 net::HTTPTestServer* server() { return server_; } |
| 27 | 27 |
| 28 protected: | 28 protected: |
| 29 scoped_refptr<HTTPTestServer> server_; | 29 scoped_refptr<net::HTTPTestServer> server_; |
| 30 }; | 30 }; |
| 31 | 31 |
| 32 #endif // CHROME_FRAME_TEST_HTTP_SERVER_H_ | 32 #endif // CHROME_FRAME_TEST_HTTP_SERVER_H_ |
| OLD | NEW |