summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_encoding_uitest.cc
diff options
context:
space:
mode:
authorjnd@chromium.org <jnd@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-04 01:17:55 +0000
committerjnd@chromium.org <jnd@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-04 01:17:55 +0000
commit58f622a6fb03938ebe10ba0ced00a9b397279ee0 (patch)
tree194f1aceb178ba5e9e487b2890dad495cd75b266 /chrome/browser/browser_encoding_uitest.cc
parent60685cb261b4eda7b9641f57ee9f165eb5cf6ed0 (diff)
downloadchromium_src-58f622a6fb03938ebe10ba0ced00a9b397279ee0.zip
chromium_src-58f622a6fb03938ebe10ba0ced00a9b397279ee0.tar.gz
chromium_src-58f622a6fb03938ebe10ba0ced00a9b397279ee0.tar.bz2
TestOverrideEncoding hanging is because TabProxy::WaitForNavigation can not get reply if current last last_navigation_time for tab _tracker is great than the input last_navigation_time.
See AutomationProvider::WaitForNavigation, it is handled by IPC_MESSAGE_HANDLER_DELAY_REPLY, which means the message handler need to send the reply message by itself. According to current WaitForNavigation logic, if current last last_navigation_time for tab _tracker is less than the input last_navigation_time, the replay will be sent by NavigationNotificationObserver. Otherwise, the reply will never be sent. So if somehow the test machine is slow, the navigation has happened before calling AutomationProvider::WaitForNavigation, the caller will never get reply. That is why TestOverrideEncoding hangs sometimes. Please refer to http://chrome-svn/viewvc/chrome?view=rev&revision=9585 to see how the logic was changed before. The problem also happened on other two places. BUG=23121 TEST=BrowserEncodingTest.TestOverrideEncoding Review URL: http://codereview.chromium.org/242024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27966 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_encoding_uitest.cc')
-rw-r--r--chrome/browser/browser_encoding_uitest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/browser_encoding_uitest.cc b/chrome/browser/browser_encoding_uitest.cc
index 7dec5b8..980aa30 100644
--- a/chrome/browser/browser_encoding_uitest.cc
+++ b/chrome/browser/browser_encoding_uitest.cc
@@ -115,7 +115,7 @@ TEST_F(BrowserEncodingTest, TestEncodingAliasMapping) {
// 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, DISABLED_TestOverrideEncoding) {
+TEST_F(BrowserEncodingTest, TestOverrideEncoding) {
const char* const kTestFileName = "gb18030_with_iso88591_meta.html";
const char* const kExpectedFileName =
"expected_gb18030_saved_from_iso88591_meta.html";