diff options
| author | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-07 23:25:52 +0000 |
|---|---|---|
| committer | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-07 23:25:52 +0000 |
| commit | 7893a989c3e8cfa8f9cc25547025d541c1205ef4 (patch) | |
| tree | 2ae568e48c773ec1c1bf614ca5ba326f9327d0d7 /chrome/test | |
| parent | 59a10b95b43a0b78ec3153ed21f2b1181a4a947e (diff) | |
| download | chromium_src-7893a989c3e8cfa8f9cc25547025d541c1205ef4.zip chromium_src-7893a989c3e8cfa8f9cc25547025d541c1205ef4.tar.gz chromium_src-7893a989c3e8cfa8f9cc25547025d541c1205ef4.tar.bz2 | |
Revert 35735 - Relanding the language detection code.
Still causes redness on the reliability bot.
The code would crash if multiple PageContents notifications
were received rapidly. The CLDHelper now notifies the
TabContents directly and the TabContents ensures only one
language detection can be performed at a time.
Added unittests to validate these cases in web_contents_unittest.cc.
Note that patch set 1 is the original patch, patch set 2 contains the new changes.
Original review:
http://codereview.chromium.org/492024/show
BUG=30662
TEST=Run the unittests.
Review URL: http://codereview.chromium.org/504051
TBR=jcampan@chromium.org
Review URL: http://codereview.chromium.org/523149
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35753 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/data/english_page.html | 6 | ||||
| -rw-r--r-- | chrome/test/data/french_page.html | 6 | ||||
| -rw-r--r-- | chrome/test/ui_test_utils.cc | 32 | ||||
| -rw-r--r-- | chrome/test/ui_test_utils.h | 4 |
4 files changed, 0 insertions, 48 deletions
diff --git a/chrome/test/data/english_page.html b/chrome/test/data/english_page.html deleted file mode 100644 index 539920d..0000000 --- a/chrome/test/data/english_page.html +++ /dev/null @@ -1,6 +0,0 @@ -<html> -<head><title>This page is in English</title></head> -<body> -No joke! This is a page written in English. Awesome don't you think? -</body> -</html> diff --git a/chrome/test/data/french_page.html b/chrome/test/data/french_page.html deleted file mode 100644 index 7fcf684..0000000 --- a/chrome/test/data/french_page.html +++ /dev/null @@ -1,6 +0,0 @@ -<html> -<head><title>Cette page est en Français</title></head> -<body> -Cette page a été rédigée en français. Saviez-vous que le Français est la langue officielle des jeux olympiques? Ça vous en bouche un coin, pas vrai? -</body> -</html> diff --git a/chrome/test/ui_test_utils.cc b/chrome/test/ui_test_utils.cc index e4b5818..6723084 100644 --- a/chrome/test/ui_test_utils.cc +++ b/chrome/test/ui_test_utils.cc @@ -254,33 +254,6 @@ class SimpleNotificationObserver : public NotificationObserver { DISALLOW_COPY_AND_ASSIGN(SimpleNotificationObserver); }; -class LanguageDetectionNotificationObserver : public NotificationObserver { - public: - explicit LanguageDetectionNotificationObserver( - RenderViewHost* render_view_host) { - registrar_.Add(this, NotificationType::TAB_LANGUAGE_DETERMINED, - Source<RenderViewHost>(render_view_host)); - ui_test_utils::RunMessageLoop(); - } - - virtual void Observe(NotificationType type, - const NotificationSource& source, - const NotificationDetails& details) { - language_ = *(Details<std::string>(details).ptr()); - MessageLoopForUI::current()->Quit(); - } - - std::string language() const { - return language_; - } - - private: - NotificationRegistrar registrar_; - std::string language_; - - DISALLOW_COPY_AND_ASSIGN(LanguageDetectionNotificationObserver); -}; - class FindInPageNotificationObserver : public NotificationObserver { public: explicit FindInPageNotificationObserver(TabContents* parent_tab) @@ -511,11 +484,6 @@ void WaitForFocusInBrowser(Browser* browser) { browser); } -std::string WaitForLanguageDetection(TabContents* tab) { - LanguageDetectionNotificationObserver observer(tab->render_view_host()); - return observer.language(); -} - int FindInPage(TabContents* tab_contents, const string16& search_string, bool forward, bool match_case, int* ordinal) { tab_contents->StartFinding(search_string, forward, match_case); diff --git a/chrome/test/ui_test_utils.h b/chrome/test/ui_test_utils.h index 2c4cd95..89dc8fc 100644 --- a/chrome/test/ui_test_utils.h +++ b/chrome/test/ui_test_utils.h @@ -115,10 +115,6 @@ void WaitForFocusChange(RenderViewHost* rvh); // traversal). void WaitForFocusInBrowser(Browser* browser); -// Waits for the language of the page to have been detected and returns it. -// This should be called right after a navigation notification was received. -std::string WaitForLanguageDetection(TabContents* tab_contents); - // Performs a find in the page of the specified tab. Returns the number of // matches found. |ordinal| is an optional parameter which is set to the index // of the current match. |