Revert of 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 ea3efeacf8d71277ad48ebbf0a9aeb61978e21fc..2a54f7fe14536627973fc33f32dbc6a56b993ab1 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,19 +135,15 @@
   EXPECT_EQ(GURL("chrome://settings/contentExceptions#media-stream-mic"),
             GetActiveTab()->GetLastCommittedURL());
 
+  // The camera bubble links to camera exceptions.
+  ManageMediaStreamSettings(TabSpecificContentSettings::CAMERA_ACCESSED);
+  EXPECT_EQ(GURL("chrome://settings/contentExceptions#media-stream-camera"),
+            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.
   ManageMediaStreamSettings(TabSpecificContentSettings::MICROPHONE_ACCESSED |
                             TabSpecificContentSettings::CAMERA_ACCESSED);
   EXPECT_EQ(GURL("chrome://settings/content#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. For
-  // this reason, order the tests so no same-document navigation occurs.
-
-  // The camera bubble links to camera exceptions.
-  ManageMediaStreamSettings(TabSpecificContentSettings::CAMERA_ACCESSED);
-  EXPECT_EQ(GURL("chrome://settings/contentExceptions#media-stream-camera"),
-            GetActiveTab()->GetLastCommittedURL());
 }