summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-13 22:05:41 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-13 22:05:41 +0000
commit87b41942ee67ef4b91ba4cf82a1778a2ed503e09 (patch)
tree9c7643f49ae7986bcc193a0b75b0d7d156ed9ead /chrome_frame
parent38dbf76f98a4a90aeffb691297a4b3aea1596848 (diff)
downloadchromium_src-87b41942ee67ef4b91ba4cf82a1778a2ed503e09.zip
chromium_src-87b41942ee67ef4b91ba4cf82a1778a2ed503e09.tar.gz
chromium_src-87b41942ee67ef4b91ba4cf82a1778a2ed503e09.tar.bz2
Remove the last usage of the python web server from chrome frame tests
Bug=54908 TBR=robertshield Review URL: http://codereview.chromium.org/3328022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59286 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/test/run_all_unittests.cc30
1 files changed, 0 insertions, 30 deletions
diff --git a/chrome_frame/test/run_all_unittests.cc b/chrome_frame/test/run_all_unittests.cc
index b25b5ae..4a7ee43 100644
--- a/chrome_frame/test/run_all_unittests.cc
+++ b/chrome_frame/test/run_all_unittests.cc
@@ -3,19 +3,12 @@
// found in the LICENSE file.
#include <atlbase.h>
-#include <iostream>
-#include "base/path_service.h"
-#include "base/platform_thread.h"
#include "base/process_util.h"
-#include "base/sys_info.h"
-#include "chrome/common/env_vars.h"
#include "base/test/test_suite.h"
#include "base/command_line.h"
#include "chrome/common/chrome_paths.h"
-
#include "chrome_frame/test/chrome_frame_test_utils.h"
-#include "chrome_frame/test/http_server.h"
#include "chrome_frame/test_utils.h"
#include "chrome_frame/utils.h"
@@ -32,10 +25,6 @@ ChromeFrameUnittestsModule _AtlModule;
const wchar_t kNoRegistrationSwitch[] = L"no-registration";
-// Causes the test executable to just run the web server and quit when the
-// server is killed. Useful for debugging tests.
-const wchar_t kRunAsServer[] = L"server";
-
void PureCall() {
__debugbreak();
}
@@ -48,25 +37,6 @@ int main(int argc, char **argv) {
TestSuite test_suite(argc, argv);
- if (CommandLine::ForCurrentProcess()->HasSwitch(kRunAsServer)) {
- ChromeFrameHTTPServer server;
- server.SetUp();
- GURL server_url(server.test_server()->GetURL(""));
- std::cout << std::endl
- << "Server waiting on " << server_url.spec().c_str()
- << std::endl << std::endl
- << "Test output will be written to "
- << server.test_server()->document_root().value() << "\\dump"
- << std::endl << std::endl
- << "Hit Ctrl-C or navigate to "
- << server_url.spec().c_str() << "kill to shut down the server."
- << std::endl;
- server.WaitToFinish(INFINITE);
- server.TearDown();
- std::cout << "Server stopped.";
- return 0;
- }
-
SetConfigBool(kChromeFrameHeadlessMode, true);
// Pretend that a screenreader is in use to cause Chrome to generate the