Solidify Entry discarding logic (NavigationHandle keeps its ID)

chrome/browser/ui/content_settings/content_setting_bubble_model_browsertest.cc

Index: chrome/browser/ui/content_settings/content_setting_bubble_model_browsertest.cc
diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model_browsertest.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model_browsertest.cc
index 2a54f7fe14536627973fc33f32dbc6a56b993ab1..8e9bbe1a28430ae35859e7cc7f412f7a61283ba7 100644
--- a/chrome/browser/ui/content_settings/content_setting_bubble_model_browsertest.cc
+++ b/chrome/browser/ui/content_settings/content_setting_bubble_model_browsertest.cc
@@ -135,10 +135,17 @@ IN_PROC_BROWSER_TEST_F(ContentSettingBubbleModelMediaStreamTest, ManageLink) {
   EXPECT_EQ(GURL("chrome://settings/contentExceptions#media-stream-mic"),
             GetActiveTab()->GetLastCommittedURL());
 
+  // In ChromeOS, we do not sanitize chrome://settings-frame to
+  // chrome://settings for same-document navigations. See crbug.com/416157.
   // The camera bubble links to camera exceptions.
+  GURL camera_url =
+#if defined(OS_CHROMEOS)
+      GURL("chrome://settings-frame/contentExceptions#media-stream-camera");

[Bernhard Bauer, 2016/02/25 09:32:43]

Why do we not do this for microphone?

[Charlie Harrison, 2016/02/25 13:24:17]

I'm not 100% sure of why the bug happens, but the url only changes to
"settings-frame" after an in-page hash navigation. The next navigation is to
"settings/content" rather than "settings/contentExceptions", so there isn't an
in-page navigation.

There may be other ways to fix this, like having 3 separate tests that aren't
stateful.

[Bernhard Bauer, 2016/02/25 13:47:07]

I think that would be good. You could also navigate to e.g. about:blank between
the test parts to reset the state.

+#else
+      GURL("chrome://settings/contentExceptions#media-stream-camera");
+#endif
   ManageMediaStreamSettings(TabSpecificContentSettings::CAMERA_ACCESSED);
-  EXPECT_EQ(GURL("chrome://settings/contentExceptions#media-stream-camera"),
-            GetActiveTab()->GetLastCommittedURL());
+  EXPECT_EQ(camera_url, GetActiveTab()->GetLastCommittedURL());
 
   // The bubble for both media devices links to the the first section of the
   // default media content settings, which is the microphone section.