summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-17 09:00:11 +0000
committerjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-17 09:00:11 +0000
commit5c49b67c52d0365b7e68c30a958295991cbebbc5 (patch)
tree9cb9db2bb62bde3089a7d76e2920cf8748e6d180 /chrome/browser
parent77b2ffdacfb0cd0383d07b02312cd7a1db74710e (diff)
downloadchromium_src-5c49b67c52d0365b7e68c30a958295991cbebbc5.zip
chromium_src-5c49b67c52d0365b7e68c30a958295991cbebbc5.tar.gz
chromium_src-5c49b67c52d0365b7e68c30a958295991cbebbc5.tar.bz2
Disabling browser tests that are testing the language detection,
since language detection is temporarily disabled. BUG=30662 TEST=None TBR=brettw Review URL: http://codereview.chromium.org/504041 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34818 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/browser_browsertest.cc4
-rw-r--r--chrome/browser/extensions/extension_browsertests_misc.cc4
2 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/browser_browsertest.cc b/chrome/browser/browser_browsertest.cc
index a948947..62d3a51 100644
--- a/chrome/browser/browser_browsertest.cc
+++ b/chrome/browser/browser_browsertest.cc
@@ -292,7 +292,9 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, FaviconOfOnloadRedirectToAnchorPage) {
// The CLD library only works on Windows at this point.
#if defined(OS_WIN)
// Tests that the CLD (Compact Language Detection) works properly.
-IN_PROC_BROWSER_TEST_F(BrowserTest, PageLanguageDetection) {
+// TODO(jcampan): http://crbug.com/30662 the language detection has been
+// temporarily disabled.
+IN_PROC_BROWSER_TEST_F(BrowserTest, DISABLED_PageLanguageDetection) {
static const wchar_t kDocRoot[] = L"chrome/test/data";
scoped_refptr<HTTPTestServer> server(
HTTPTestServer::CreateServer(kDocRoot, NULL));
diff --git a/chrome/browser/extensions/extension_browsertests_misc.cc b/chrome/browser/extensions/extension_browsertests_misc.cc
index 97ef316..cd68b1a 100644
--- a/chrome/browser/extensions/extension_browsertests_misc.cc
+++ b/chrome/browser/extensions/extension_browsertests_misc.cc
@@ -89,6 +89,9 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, Toolstrip) {
EXPECT_TRUE(result);
#if defined(OS_WIN)
+// TODO(jcampan): http://crbug.com/30662 the language detection has been
+// temporarily disabled.
+#if 0
// http://crbug.com/29896 - tabs.detectLanguage is Windows only
// Test for compact language detection API. First navigate to a (static) html
@@ -105,6 +108,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, Toolstrip) {
host->render_view_host(), L"", L"testTabsLanguageAPI()", &result);
EXPECT_TRUE(result);
#endif
+#endif
}
IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, ExtensionViews) {