chrome/browser/browser_uitest.cc - Issue 17030: Revert 7508.7509 and 7510

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/browser_uitest.cc

Issue 17030: Revert 7508.7509 and 7510 (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 12 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chrome/browser/browser_uitest.cc

===================================================================

--- chrome/browser/browser_uitest.cc (revision 7513)

+++ chrome/browser/browser_uitest.cc (working copy)

@@ -240,9 +240,7 @@

return;

const wchar_t kDocRoot[] = L"chrome/test/data";

- scoped_refptr<HTTPTestServer> server =

- HTTPTestServer::CreateServer(kDocRoot);

- ASSERT_TRUE(NULL != server.get());

+ TestServer server(kDocRoot);

std::wstring test_file(test_data_directory_);

scoped_ptr<BrowserProxy> window(automation()->GetBrowserWindow(0));

scoped_ptr<TabProxy> tab(window->GetActiveTab());

@@ -280,9 +278,7 @@