Revert of Solidify Entry discarding logic (NavigationHandle keeps its ID)

chrome/browser/ui/content_settings/content_setting_bubble_model_browsertest.cc

 // Copyright 2014 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 <vector>
 
 #include "base/files/file_path.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 117 matching lines @@
 // the correct section of the settings UI.
 IN_PROC_BROWSER_TEST_F(ContentSettingBubbleModelMediaStreamTest, ManageLink) {
   // For each of the three options, we click the management link and check if
   // the active tab loads the correct internal url.
 
   // The microphone bubble links to microphone exceptions.
   ManageMediaStreamSettings(TabSpecificContentSettings::MICROPHONE_ACCESSED);
   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());
 }