summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_browsertest.cc
diff options
context:
space:
mode:
authorjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-20 02:32:24 +0000
committerjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-20 02:32:24 +0000
commitbdd7a12d4abc0b6456f679bb077045a0147c3dfc (patch)
treeb660235491e9e7e7b83ca4952243ffc3c44573c0 /chrome/browser/browser_browsertest.cc
parent935d561148669a26ece1535343a7be8bef3392ab (diff)
downloadchromium_src-bdd7a12d4abc0b6456f679bb077045a0147c3dfc.zip
chromium_src-bdd7a12d4abc0b6456f679bb077045a0147c3dfc.tar.gz
chromium_src-bdd7a12d4abc0b6456f679bb077045a0147c3dfc.tar.bz2
Revert 36589 - Still failing the reliability tests.
Another try at landing this. It caused several tests to fails previously. There was a crasher in some Windows code in the CLD that has been removed by the port of the CLD code to Linux and Mac. That should hopefully make everything work now. Enabling language detection on page load. A memory error has been fixed in the CLD library in the meantime. This should hopefully fixes the crashers in the reliability tests. Note that this version is actually simpler than the original review since the detection is now performed in the renderer. (So the CLD code runs sandboxed.) Original review: http://codereview.chromium.org/492024/show BUG=30662 TEST=Run the unittests. TBR=brettw Review URL: http://codereview.chromium.org/552049 TBR=jcampan@chromium.org Review URL: http://codereview.chromium.org/554015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36603 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_browsertest.cc')
-rw-r--r--chrome/browser/browser_browsertest.cc30
1 files changed, 0 insertions, 30 deletions
diff --git a/chrome/browser/browser_browsertest.cc b/chrome/browser/browser_browsertest.cc
index 080cfa2..756b7dc 100644
--- a/chrome/browser/browser_browsertest.cc
+++ b/chrome/browser/browser_browsertest.cc
@@ -288,33 +288,3 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, FaviconOfOnloadRedirectToAnchorPage) {
controller().GetActiveEntry();
EXPECT_EQ(expected_favicon_url.spec(), entry->favicon().url().spec());
}
-
-// Tests that the CLD (Compact Language Detection) works properly.
-IN_PROC_BROWSER_TEST_F(BrowserTest, PageLanguageDetection) {
- static const wchar_t kDocRoot[] = L"chrome/test/data";
- scoped_refptr<HTTPTestServer> server(
- HTTPTestServer::CreateServer(kDocRoot, NULL));
- ASSERT_TRUE(NULL != server.get());
-
- TabContents* current_tab = browser()->GetSelectedTabContents();
-
- // Navigate to a page in English.
- ui_test_utils::NavigateToURL(
- browser(), GURL(server->TestServerPage("files/english_page.html")));
- NavigationEntry* entry = current_tab->controller().GetActiveEntry();
- ASSERT_TRUE(NULL != entry);
- EXPECT_TRUE(entry->language().empty());
- std::string lang = ui_test_utils::WaitForLanguageDetection(current_tab);
- EXPECT_EQ("en", lang);
- EXPECT_EQ("en", entry->language());
-
- // Now navigate to a page in French.
- ui_test_utils::NavigateToURL(
- browser(), GURL(server->TestServerPage("files/french_page.html")));
- entry = current_tab->controller().GetActiveEntry();
- ASSERT_TRUE(NULL != entry);
- EXPECT_TRUE(entry->language().empty());
- lang = ui_test_utils::WaitForLanguageDetection(current_tab);
- EXPECT_EQ("fr", lang);
- EXPECT_EQ("fr", entry->language());
-}