OOPIF: Set timer for per-frame UpdateState.

content/renderer/render_view_browsertest.cc

Index: content/renderer/render_view_browsertest.cc
diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc
index 1a9a23d47afbddc3e5dea3e74b019f9f111885f4..bcdc6afd7ffd6f940341e187fa8441af8f4225b3 100644
--- a/content/renderer/render_view_browsertest.cc
+++ b/content/renderer/render_view_browsertest.cc
@@ -453,11 +453,6 @@ TEST_F(RenderViewImplTest, SaveImageFromDataURL) {
 
 // Test that we get form state change notifications when input fields change.
 TEST_F(RenderViewImplTest, OnNavStateChanged) {
-  // TODO(creis): Make the UpdateState timer work in OOPIF modes.
-  // See https://crbug.com/545219.
-  if (SiteIsolationPolicy::UseSubframeNavigationEntries())
-    return;
-
   // 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.
@@ -467,6 +462,8 @@ TEST_F(RenderViewImplTest, 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();
 
@@ -475,8 +472,13 @@ TEST_F(RenderViewImplTest, 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) {