Notify about PageState changes after an AUTO_SUBFRAME commit.

content/browser/frame_host/navigation_controller_impl_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/frame_host/navigation_controller_impl.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
@@ skipping 2178 matching lines @@
     params.transition = ui::PAGE_TRANSITION_AUTO_SUBFRAME;
     params.should_update_history = false;
     params.gesture = NavigationGestureUser;
     params.method = "GET";
     params.page_state = PageState::CreateFromURL(subframe_url);
 
     // Navigating should do nothing.
     subframe->SendRendererInitiatedNavigationRequest(subframe_url, false);
     subframe->PrepareForCommit();
     subframe->SendNavigateWithParams(&params);
-    EXPECT_EQ(0U, notifications.size());
+
+    // In UseSubframeNavigationEntries mode, we notify of a PageState update to
+    // the entry here rather than during UpdateState.
+    if (SiteIsolationPolicy::UseSubframeNavigationEntries())
+      EXPECT_TRUE(notifications.Check1AndReset(NOTIFICATION_NAV_ENTRY_CHANGED));
+    else
+      EXPECT_EQ(0U, notifications.size());
   }
 
   // Now do a new navigation in the frame.
   const GURL url2("http://foo2");
   FrameHostMsg_DidCommitProvisionalLoad_Params params;
   params.page_id = 2;
   params.nav_entry_id = 0;
   params.frame_unique_name = unique_name;
   params.did_create_new_entry = true;
   params.url = url2;
@@ skipping 66 matching lines @@
     params.transition = ui::PAGE_TRANSITION_AUTO_SUBFRAME;
     params.should_update_history = false;
     params.gesture = NavigationGestureUser;
     params.method = "GET";
     params.page_state = PageState::CreateFromURL(url2);
 
     // Navigating should do nothing.
     subframe->SendRendererInitiatedNavigationRequest(url2, false);
     subframe->PrepareForCommit();
     subframe->SendNavigateWithParams(&params);
-    EXPECT_EQ(0U, notifications.size());
+
+    // In UseSubframeNavigationEntries mode, we notify of a PageState update to
+    // the entry here rather than during UpdateState.
+    if (SiteIsolationPolicy::UseSubframeNavigationEntries())
+      EXPECT_TRUE(notifications.Check1AndReset(NOTIFICATION_NAV_ENTRY_CHANGED));
+    else
+      EXPECT_EQ(0U, notifications.size());
   }
 
   // There should still be only one entry.
   EXPECT_EQ(1, controller.GetEntryCount());
   NavigationEntryImpl* entry = controller.GetLastCommittedEntry();
   EXPECT_EQ(url1, entry->GetURL());
   EXPECT_EQ(1, entry->GetPageID());
   FrameNavigationEntry* root_entry = entry->root_node()->frame_entry.get();
   EXPECT_EQ(url1, root_entry->url());
 
@@ skipping 28 matching lines @@
     params.transition = ui::PAGE_TRANSITION_AUTO_SUBFRAME;
     params.should_update_history = false;
     params.gesture = NavigationGestureUser;
     params.method = "GET";
     params.page_state = PageState::CreateFromURL(url3);
 
     // Navigating should do nothing.
     subframe2->SendRendererInitiatedNavigationRequest(url3, false);
     subframe2->PrepareForCommit();
     subframe2->SendNavigateWithParams(&params);
-    EXPECT_EQ(0U, notifications.size());
+
+    // In UseSubframeNavigationEntries mode, we notify of a PageState update to
+    // the entry here rather than during UpdateState.
+    if (SiteIsolationPolicy::UseSubframeNavigationEntries())
+      EXPECT_TRUE(notifications.Check1AndReset(NOTIFICATION_NAV_ENTRY_CHANGED));
+    else
+      EXPECT_EQ(0U, notifications.size());
   }
 
   // There should still be only one entry, mostly unchanged.
   EXPECT_EQ(1, controller.GetEntryCount());
   EXPECT_EQ(entry, controller.GetLastCommittedEntry());
   EXPECT_EQ(url1, entry->GetURL());
   EXPECT_EQ(1, entry->GetPageID());
   EXPECT_EQ(root_entry, entry->root_node()->frame_entry.get());
   EXPECT_EQ(url1, root_entry->url());
 
@@ skipping 33 matching lines @@
     params.transition = ui::PAGE_TRANSITION_AUTO_SUBFRAME;
     params.should_update_history = false;
     params.gesture = NavigationGestureUser;
     params.method = "GET";
     params.page_state = PageState::CreateFromURL(url4);
 
     // Navigating should do nothing.
     subframe3->SendRendererInitiatedNavigationRequest(url4, false);
     subframe3->PrepareForCommit();
     subframe3->SendNavigateWithParams(&params);
-    EXPECT_EQ(0U, notifications.size());
+
+    // In UseSubframeNavigationEntries mode, we notify of a PageState update to
+    // the entry here rather than during UpdateState.
+    if (SiteIsolationPolicy::UseSubframeNavigationEntries())
+      EXPECT_TRUE(notifications.Check1AndReset(NOTIFICATION_NAV_ENTRY_CHANGED));
+    else
+      EXPECT_EQ(0U, notifications.size());
   }
 
   // There should still be only one entry, mostly unchanged.
   EXPECT_EQ(1, controller.GetEntryCount());
   EXPECT_EQ(entry, controller.GetLastCommittedEntry());
   EXPECT_EQ(url1, entry->GetURL());
   EXPECT_EQ(1, entry->GetPageID());
   EXPECT_EQ(root_entry, entry->root_node()->frame_entry.get());
   EXPECT_EQ(url1, root_entry->url());
 
@@ skipping 48 matching lines @@
     params.should_update_history = false;
     params.gesture = NavigationGestureUser;
     params.method = "GET";
     params.page_state = PageState::CreateFromURL(subframe_url);
     params.item_sequence_number = item_sequence_number1;
 
     // Navigating should do nothing.
     subframe->SendRendererInitiatedNavigationRequest(subframe_url, false);
     subframe->PrepareForCommit();
     subframe->SendNavigateWithParams(&params);
-    EXPECT_EQ(0U, notifications.size());
+
+    // In UseSubframeNavigationEntries mode, we notify of a PageState update to
+    // the entry here rather than during UpdateState.
+    if (SiteIsolationPolicy::UseSubframeNavigationEntries())
+      EXPECT_TRUE(notifications.Check1AndReset(NOTIFICATION_NAV_ENTRY_CHANGED));
+    else
+      EXPECT_EQ(0U, notifications.size());
   }
 
   // First manual subframe navigation.
   const GURL url2("http://foo2");
   int64_t item_sequence_number2 = base::Time::Now().ToDoubleT() * 1000000;
   FrameHostMsg_DidCommitProvisionalLoad_Params params;
   params.page_id = 2;
   params.nav_entry_id = 0;
   params.frame_unique_name = unique_name;
   params.did_create_new_entry = true;
@@ skipping 2861 matching lines @@
   EXPECT_EQ(default_ssl_status.connection_status,
             observer.details().ssl_status.connection_status);
   EXPECT_EQ(default_ssl_status.content_status,
             observer.details().ssl_status.content_status);
   EXPECT_EQ(default_ssl_status.sct_statuses,
             observer.details().ssl_status.sct_statuses);
   EXPECT_EQ(1, main_test_rfh()->GetProcess()->bad_msg_count());
 }
 
 }  // namespace content