Revert of Don't ensure, in single-process mode, that WebUI render views are the only ones in the process, as …

content/browser/frame_host/render_frame_host_manager_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 "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/histogram_tester.h"
 #include "base/time/time.h"
 #include "content/browser/frame_host/cross_site_transferring_request.h"
@@ skipping 1018 matching lines @@
 
   // No cross-process transition happens because we are already in the right
   // SiteInstance.  We should grant bindings immediately.
   EXPECT_EQ(host2, manager2->current_frame_host());
   EXPECT_TRUE(
       host2->render_view_host()->GetEnabledBindings() & BINDINGS_POLICY_WEB_UI);
 
   manager2->DidNavigateFrame(host2);
 }
 
-// Test that WebUI can be navigated to in single-process mode.
-TEST_F(RenderFrameHostManagerTest,
-       CanNavigateBetweenNormalPagesAndWebUIInSingleProcess) {
-  const GURL kNormalUrl1("http://chromium.org");
-  const GURL kNormalUrl2("http://example.com");
-  const GURL kWebUIUrl("chrome://foo");
-
-  // We both set flag on RenderProcesHost and append the switch due to the fact
-  // that some code checks the switch directly instead of relying
-  // on RenderProcessHost
-  RenderProcessHost::SetRunRendererInProcess(true);
-  CommandLine::ForCurrentProcess()->AppendSwitch(switches::kSingleProcess);
-  set_should_create_webui(true);
-
-  RenderFrameHostManager* manager = static_cast<TestWebContents*>(
-      web_contents())->GetRenderManagerForTesting();
-
-  NavigateAndCommit(kNormalUrl1);
-  EXPECT_EQ(kNormalUrl1,
-            manager->current_frame_host()->GetSiteInstance()->GetSiteURL());
-  EXPECT_FALSE(manager->web_ui());
-  NavigateAndCommit(kWebUIUrl);
-  EXPECT_EQ(kWebUIUrl,
-            manager->current_frame_host()->GetSiteInstance()->GetSiteURL());
-  EXPECT_TRUE(manager->web_ui());
-  NavigateAndCommit(kNormalUrl2);
-  EXPECT_EQ(kNormalUrl2,
-            manager->current_frame_host()->GetSiteInstance()->GetSiteURL());
-  EXPECT_FALSE(manager->web_ui());
-}
-
 // Tests that we don't end up in an inconsistent state if a page does a back and
 // then reload. http://crbug.com/51680
 TEST_F(RenderFrameHostManagerTest, PageDoesBackAndReload) {
   const GURL kUrl1("http://www.google.com/");
   const GURL kUrl2("http://www.evil-site.com/");
 
   // Navigate to a safe site, then an evil site.
   // This will switch RenderFrameHosts.  We cannot assert that the first and
   // second RFHs are different, though, because the first one may be promptly
   // deleted.
@@ skipping 926 matching lines @@
       FrameMsg_Navigate_Type::RELOAD_IGNORING_CACHE);
   contents()->GetMainFrame()->SendBeginNavigationWithURL(kUrl);
   // A NavigationRequest should have been generated.
   main_request = GetNavigationRequestForRenderFrameManager(render_manager);
   ASSERT_TRUE(main_request != NULL);
   EXPECT_EQ(FrameMsg_Navigate_Type::RELOAD_IGNORING_CACHE,
             main_request->common_params().navigation_type);
 }
 
 }  // namespace content