summaryrefslogtreecommitdiffstats
path: root/chrome/browser/printing
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-30 07:17:30 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-30 07:17:30 +0000
commitf72a1ccce08050ede3d1e46cbbcd9cf5b3a1c236 (patch)
treee915476e6da96eb67e56e6ea63c8d05a4280cbee /chrome/browser/printing
parent7e868c9633b4d6f41c8d559625b69ef9fece5b8b (diff)
downloadchromium_src-f72a1ccce08050ede3d1e46cbbcd9cf5b3a1c236.zip
chromium_src-f72a1ccce08050ede3d1e46cbbcd9cf5b3a1c236.tar.gz
chromium_src-f72a1ccce08050ede3d1e46cbbcd9cf5b3a1c236.tar.bz2
Remove deprecated things from net test suite:
- URLRequestTestContext (from now on use TestURLRequestContext) - TestServerPageW (use TestServerPage). TEST=none BUG=none Review URL: http://codereview.chromium.org/1814002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46044 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/printing')
-rw-r--r--chrome/browser/printing/printing_layout_uitest.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/printing/printing_layout_uitest.cc b/chrome/browser/printing/printing_layout_uitest.cc
index d205f7b..5cfe387 100644
--- a/chrome/browser/printing/printing_layout_uitest.cc
+++ b/chrome/browser/printing/printing_layout_uitest.cc
@@ -304,19 +304,19 @@ TEST_F(PrintingLayoutTextTest, DISABLED_Complex) {
}
struct TestPool {
- const wchar_t* source;
+ const char* source;
const wchar_t* result;
};
const TestPool kTestPool[] = {
// ImagesB&W
- L"files/printing/test2.html", L"test2",
+ "files/printing/test2.html", L"test2",
// ImagesTransparent
- L"files/printing/test3.html", L"test3",
+ "files/printing/test3.html", L"test3",
// ImageColor
- L"files/printing/test4.html", L"test4",
+ "files/printing/test4.html", L"test4",
// TODO(maruel): http://b/1171450 Transparent overlays are drawn opaque
- // L"files/printing/test5.html", L"test5",
+ // "files/printing/test5.html", L"test5",
};
// TODO(maruel:) http://code.google.com/p/chromium/issues/detail?id=7721
@@ -334,7 +334,7 @@ TEST_F(PrintingLayoutTestHidden, DISABLED_ManyTimes) {
if (i)
CleanupDumpDirectory();
const TestPool& test = kTestPool[i % arraysize(kTestPool)];
- NavigateToURL(server->TestServerPageW(test.source));
+ NavigateToURL(server->TestServerPage(test.source));
base::DelegateSimpleThread close_printdlg_thread1(&dismisser,
"close_printdlg_thread");
EXPECT_EQ(NULL, FindDialogWindow(dismisser.owner_process()));