summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_encoding_uitest.cc
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-04 17:01:05 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-04 17:01:05 +0000
commitf83f910cdbab68232528eb99730e80181709fae0 (patch)
tree2a924db0f6fc66fe5599a565fe2e113cbe2e2f98 /chrome/browser/browser_encoding_uitest.cc
parentac4bf50fc19c4111726db37478a7d5be6132b562 (diff)
downloadchromium_src-f83f910cdbab68232528eb99730e80181709fae0.zip
chromium_src-f83f910cdbab68232528eb99730e80181709fae0.tar.gz
chromium_src-f83f910cdbab68232528eb99730e80181709fae0.tar.bz2
Enable more parts of automation on all platforms:
- overriding encoding - printing Initially we couldn't compile them on all platforms, now it's possible. Overriding of encoding works fully everywhere (this also enables a test for that), printing might hit some NOTIMPLEMENTEDs on non-Windows platforms. TEST=none BUG=none Review URL: http://codereview.chromium.org/1943001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46359 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_encoding_uitest.cc')
-rw-r--r--chrome/browser/browser_encoding_uitest.cc5
1 files changed, 0 insertions, 5 deletions
diff --git a/chrome/browser/browser_encoding_uitest.cc b/chrome/browser/browser_encoding_uitest.cc
index 1669136..3c0531b 100644
--- a/chrome/browser/browser_encoding_uitest.cc
+++ b/chrome/browser/browser_encoding_uitest.cc
@@ -109,10 +109,6 @@ TEST_F(BrowserEncodingTest, TestEncodingAliasMapping) {
}
}
-#if defined(OS_WIN)
-// We are disabling this test on MacOS and Linux because on those platforms
-// AutomationProvider::OverrideEncoding is not implemented yet.
-// TODO(port): Enable when encoding-related parts of Browser are ported.
TEST_F(BrowserEncodingTest, TestOverrideEncoding) {
const char* const kTestFileName = "gb18030_with_iso88591_meta.html";
const char* const kExpectedFileName =
@@ -157,7 +153,6 @@ TEST_F(BrowserEncodingTest, TestOverrideEncoding) {
expected_file_name = expected_file_name.AppendASCII(kExpectedFileName);
CheckFile(full_file_name, expected_file_name, true);
}
-#endif // defined(OS_WIN)
// The following encodings are excluded from the auto-detection test because
// it's a known issue that the current encoding detector does not detect them: