Revert 215836 "Ensure that renderer-initiated pending entries ca..."

trunk/src/content/browser/web_contents/navigation_controller_impl_unittest.cc

 // Copyright (c) 2012 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/basictypes.h"
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/stl_util.h"
@@ skipping 2594 matching lines @@
   ASSERT_EQ(controller.GetEntryCount(), 1);
   EXPECT_EQ(controller.GetEntryAtIndex(0)->GetURL(), url0);
 
   // Load of |transient_url| completes.
   test_rvh()->SendNavigate(1, transient_url);
   ASSERT_EQ(controller.GetEntryCount(), 2);
   EXPECT_EQ(controller.GetEntryAtIndex(0)->GetURL(), url0);
   EXPECT_EQ(controller.GetEntryAtIndex(1)->GetURL(), transient_url);
 }
 
-// Ensure that renderer initiated pending entries get replaced, so that we
-// don't show a stale virtual URL when a navigation commits.
-// See http://crbug.com/266922.
-TEST_F(NavigationControllerTest, RendererInitiatedPendingEntries) {
-  NavigationControllerImpl& controller = controller_impl();
-
-  const GURL url1("nonexistent:12121");
-  const GURL url1_fixed("http://nonexistent:12121/");
-  const GURL url2("http://foo");
-
-  // We create pending entries for renderer-initiated navigations so that we
-  // can show them in new tabs when it is safe.
-  contents()->DidStartProvisionalLoadForFrame(
-      test_rvh(), 1, -1, true, url1);
-
-  // Simulate what happens if a BrowserURLHandler rewrites the URL, causing
-  // the virtual URL to differ from the URL.
-  controller.GetPendingEntry()->SetURL(url1_fixed);
-  controller.GetPendingEntry()->SetVirtualURL(url1);
-
-  EXPECT_EQ(url1_fixed, controller.GetPendingEntry()->GetURL());
-  EXPECT_EQ(url1, controller.GetPendingEntry()->GetVirtualURL());
-  EXPECT_TRUE(
-      NavigationEntryImpl::FromNavigationEntry(controller.GetPendingEntry())->
-          is_renderer_initiated());
-
-  // If the user clicks another link, we should replace the pending entry.
-  contents()->DidStartProvisionalLoadForFrame(
-      test_rvh(), 1, -1, true, url2);
-  EXPECT_EQ(url2, controller.GetPendingEntry()->GetURL());
-  EXPECT_EQ(url2, controller.GetPendingEntry()->GetVirtualURL());
-
-  // Once it commits, the URL and virtual URL should reflect the actual page.
-  test_rvh()->SendNavigate(0, url2);
-  EXPECT_EQ(url2, controller.GetLastCommittedEntry()->GetURL());
-  EXPECT_EQ(url2, controller.GetLastCommittedEntry()->GetVirtualURL());
-}
-
 // Tests that the URLs for renderer-initiated navigations are not displayed to
 // the user until the navigation commits, to prevent URL spoof attacks.
 // See http://crbug.com/99016.
 TEST_F(NavigationControllerTest, DontShowRendererURLUntilCommit) {
   NavigationControllerImpl& controller = controller_impl();
   TestNotificationTracker notifications;
   RegisterForAllNavNotifications(&notifications, &controller);
 
   const GURL url0("http://foo/0");
   const GURL url1("http://foo/1");
@@ skipping 1272 matching lines @@
                     PAGE_TRANSITION_LINK);
   session_helper_.AssertNavigationEquals(nav,
                                          windows_[0]->tabs[0]->navigations[0]);
   nav.set_url(url2);
   session_helper_.AssertNavigationEquals(nav,
                                          windows_[0]->tabs[0]->navigations[1]);
 }
 */
 
 }  // namespace content