summaryrefslogtreecommitdiffstats
path: root/chrome_frame/test
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-06 14:39:08 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-06 14:39:08 +0000
commit3d0a309134292d1a19253391503dbdcb657df7a9 (patch)
tree176726adf90bad60a969dcc7866f9635aad6f497 /chrome_frame/test
parenta66397e4836935deec66807fa13650ad342de641 (diff)
downloadchromium_src-3d0a309134292d1a19253391503dbdcb657df7a9.zip
chromium_src-3d0a309134292d1a19253391503dbdcb657df7a9.tar.gz
chromium_src-3d0a309134292d1a19253391503dbdcb657df7a9.tar.bz2
Remove TestServer::WaitToFinish, it is now unused.
BUG=none TEST=none Review URL: http://codereview.chromium.org/3555012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61639 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test')
-rw-r--r--chrome_frame/test/http_server.cc9
-rw-r--r--chrome_frame/test/http_server.h1
2 files changed, 0 insertions, 10 deletions
diff --git a/chrome_frame/test/http_server.cc b/chrome_frame/test/http_server.cc
index 496e1ba..63da6ad 100644
--- a/chrome_frame/test/http_server.cc
+++ b/chrome_frame/test/http_server.cc
@@ -63,15 +63,6 @@ void ChromeFrameHTTPServer::TearDown() {
file_util::Delete(cfi_path, false);
}
-bool ChromeFrameHTTPServer::WaitToFinish(int milliseconds) {
- bool ret = test_server_.WaitToFinish(milliseconds);
- if (!ret) {
- LOG(ERROR) << "WaitToFinish failed with error:" << ::GetLastError();
- ret = test_server_.Stop();
- }
- return ret;
-}
-
// TODO(phajdan.jr): Change wchar_t* to std::string& and fix callers.
GURL ChromeFrameHTTPServer::Resolve(const wchar_t* relative_url) {
return test_server_.GetURL(WideToUTF8(relative_url));
diff --git a/chrome_frame/test/http_server.h b/chrome_frame/test/http_server.h
index a6dae20..fe88ba9 100644
--- a/chrome_frame/test/http_server.h
+++ b/chrome_frame/test/http_server.h
@@ -21,7 +21,6 @@ class ChromeFrameHTTPServer {
void SetUp();
void TearDown();
- bool WaitToFinish(int milliseconds);
GURL Resolve(const wchar_t* relative_url);
FilePath GetDataDir();