summaryrefslogtreecommitdiffstats
path: root/chrome/test/ui
diff options
context:
space:
mode:
authorerikkay@google.com <erikkay@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-08 20:45:27 +0000
committererikkay@google.com <erikkay@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-08 20:45:27 +0000
commitdd26501ef315e241911a31a8a98027c9bbb65560 (patch)
tree1c02dfce0035199f0c073ebf793607d6e7934be5 /chrome/test/ui
parent7ecec17feb965bab7cd348ab16a9da8d772f70dc (diff)
downloadchromium_src-dd26501ef315e241911a31a8a98027c9bbb65560.zip
chromium_src-dd26501ef315e241911a31a8a98027c9bbb65560.tar.gz
chromium_src-dd26501ef315e241911a31a8a98027c9bbb65560.tar.bz2
Add FTP unit test in preparation for portable FTP implementation.
Clean up test server code. Originally from issue 12939, written by Ibrar Ahmed (ibrar.ahmed@gmail.com) (take 2) Review URL: http://codereview.chromium.org/17040 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7755 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/ui')
-rw-r--r--chrome/test/ui/inspector_controller_uitest.cc14
1 files changed, 10 insertions, 4 deletions
diff --git a/chrome/test/ui/inspector_controller_uitest.cc b/chrome/test/ui/inspector_controller_uitest.cc
index 885eb69..29b1489 100644
--- a/chrome/test/ui/inspector_controller_uitest.cc
+++ b/chrome/test/ui/inspector_controller_uitest.cc
@@ -37,14 +37,20 @@ TEST_F(InspectorControllerTest, DISABLED_InspectElement) {
if (CommandLine().HasSwitch(switches::kSingleProcess))
return;
- TestServer server(L"chrome/test/data");
+ scoped_refptr<HTTPTestServer> server =
+ HTTPTestServer::CreateServer(L"chrome/test/data");
+ ASSERT_TRUE(NULL != server.get());
+
::scoped_ptr<TabProxy> tab(GetActiveTabProxy());
// We don't track resources until we've opened the inspector.
- NavigateTab(tab.get(), server.TestServerPageW(L"files/inspector/test1.html"));
+ NavigateTab(tab.get(), server->TestServerPageW(
+ L"files/inspector/test1.html"));
tab->InspectElement(0, 0);
- NavigateTab(tab.get(), server.TestServerPageW(L"files/inspector/test1.html"));
+ NavigateTab(tab.get(), server->TestServerPageW(
+ L"files/inspector/test1.html"));
EXPECT_EQ(1, tab->InspectElement(0, 0));
- NavigateTab(tab.get(), server.TestServerPageW(L"files/inspector/test2.html"));
+ NavigateTab(tab.get(), server->TestServerPageW(
+ L"files/inspector/test2.html"));
EXPECT_EQ(2, tab->InspectElement(0, 0));
}