Index: content/renderer/render_view_browsertest.cc |
diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc |
index 724c8e853eeab87ee86275086c6c7fa19b604a59..acf7fa22fa81a75ee5c2d00590b0c5c878b3ee49 100644 |
--- a/content/renderer/render_view_browsertest.cc |
+++ b/content/renderer/render_view_browsertest.cc |
@@ -452,7 +452,7 @@ TEST_F(RenderViewImplTest, SaveImageFromDataURL) { |
} |
// Test that we get form state change notifications when input fields change. |
-TEST_F(RenderViewImplTest, DISABLED_OnNavStateChanged) { |
Charlie Reis
2015/11/25 20:22:12
I'm thinking I'll re-enable the test first in http
|
+TEST_F(RenderViewImplTest, OnNavStateChanged) { |
// Don't want any delay for form state sync changes. This will still post a |
// message so updates will get coalesced, but as soon as we spin the message |
// loop, it will generate an update. |
@@ -462,6 +462,8 @@ TEST_F(RenderViewImplTest, DISABLED_OnNavStateChanged) { |
// We should NOT have gotten a form state change notification yet. |
EXPECT_FALSE(render_thread_->sink().GetFirstMessageMatching( |
+ FrameHostMsg_UpdateState::ID)); |
+ EXPECT_FALSE(render_thread_->sink().GetFirstMessageMatching( |
ViewHostMsg_UpdateState::ID)); |
render_thread_->sink().ClearMessages(); |
@@ -470,8 +472,13 @@ TEST_F(RenderViewImplTest, DISABLED_OnNavStateChanged) { |
ExecuteJavaScriptForTests( |
"document.getElementById('elt_text').value = 'foo';"); |
ProcessPendingMessages(); |
- EXPECT_TRUE(render_thread_->sink().GetUniqueMessageMatching( |
- ViewHostMsg_UpdateState::ID)); |
+ if (SiteIsolationPolicy::UseSubframeNavigationEntries()) { |
+ EXPECT_TRUE(render_thread_->sink().GetUniqueMessageMatching( |
+ FrameHostMsg_UpdateState::ID)); |
+ } else { |
+ EXPECT_TRUE(render_thread_->sink().GetUniqueMessageMatching( |
+ ViewHostMsg_UpdateState::ID)); |
+ } |
} |
TEST_F(RenderViewImplTest, OnNavigationHttpPost) { |