diff options
| author | gregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-13 05:15:12 +0000 |
|---|---|---|
| committer | gregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-13 05:15:12 +0000 |
| commit | b66149db84f143c8d23221336dcde4c42122ea29 (patch) | |
| tree | a0c437913b3e5ad2d5daee0011868f9f92dd3743 /chrome/test/ui | |
| parent | 6d2e6685cbbb2f9c503ae88f12ca93bfb462aa49 (diff) | |
| download | chromium_src-b66149db84f143c8d23221336dcde4c42122ea29.zip chromium_src-b66149db84f143c8d23221336dcde4c42122ea29.tar.gz chromium_src-b66149db84f143c8d23221336dcde4c42122ea29.tar.bz2 | |
Revert 28796 - This is a simple integration test that loads a simple nexe and verifies that Javascript can communicate with it. The required html, javascript and nexe files are checked in into the NaCl tree.
Review URL: http://codereview.chromium.org/272005
TBR=gregoryd@google.com
Review URL: http://codereview.chromium.org/270080
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28797 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/ui')
| -rw-r--r-- | chrome/test/ui/ui_test.cc | 8 | ||||
| -rw-r--r-- | chrome/test/ui/ui_test.h | 4 |
2 files changed, 0 insertions, 12 deletions
diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc index 8bdf9b0..c4a37e2 100644 --- a/chrome/test/ui/ui_test.cc +++ b/chrome/test/ui/ui_test.cc @@ -306,11 +306,6 @@ static void RunCommand(const CommandLine& cmd_line) { } void UITest::StartHttpServer(const FilePath& root_directory) { - StartHttpServerWithPort(root_directory, L""); -} - -void UITest::StartHttpServerWithPort(const FilePath& root_directory, - const std::wstring& port) { scoped_ptr<CommandLine> cmd_line(CreateHttpServerCommandLine()); ASSERT_TRUE(cmd_line.get()); cmd_line->AppendSwitchWithValue("server", "start"); @@ -325,9 +320,6 @@ void UITest::StartHttpServerWithPort(const FilePath& root_directory, cmd_line->AppendSwitch("run_background"); #endif - if (!port.empty()) { - cmd_line->AppendSwitchWithValue(L"port", port); - } RunCommand(*cmd_line.get()); } diff --git a/chrome/test/ui/ui_test.h b/chrome/test/ui/ui_test.h index 177e5d8..4112549a 100644 --- a/chrome/test/ui/ui_test.h +++ b/chrome/test/ui/ui_test.h @@ -450,10 +450,6 @@ class UITest : public testing::Test { // Synchronously launches local http server normally used to run LayoutTests. void StartHttpServer(const FilePath& root_directory); - - // Launches local http server on the specified port. - void StartHttpServerWithPort(const FilePath& root_directory, - const std::wstring& port); void StopHttpServer(); private: |