Revert 3 CLs for shouldOverrideUrlLoading implementation.

content/browser/web_contents/web_contents_impl_browsertest.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/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "build/build_config.h"
 #include "content/browser/frame_host/navigation_entry_impl.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
@@ skipping 171 matching lines @@
   int loadingStateChangedCount() const { return loadingStateChangedCount_; }
   int loadingStateToDifferentDocumentCount() const {
     return loadingStateToDifferentDocumentCount_;
   }
 
  private:
   int loadingStateChangedCount_;
   int loadingStateToDifferentDocumentCount_;
 };
 
+// See: http://crbug.com/298193
+#if defined(OS_WIN) || defined(OS_LINUX)
+#define MAYBE_DidStopLoadingDetails DISABLED_DidStopLoadingDetails
+#else
+#define MAYBE_DidStopLoadingDetails DidStopLoadingDetails
+#endif
+
+// Test that DidStopLoading includes the correct URL in the details.
+IN_PROC_BROWSER_TEST_F(WebContentsImplBrowserTest,
+                       MAYBE_DidStopLoadingDetails) {
+  ASSERT_TRUE(embedded_test_server()->Start());
+
+  LoadStopNotificationObserver load_observer(
+      &shell()->web_contents()->GetController());
+  NavigateToURL(shell(), embedded_test_server()->GetURL("/title1.html"));
+  load_observer.Wait();
+
+  EXPECT_EQ("/title1.html", load_observer.url_.path());
+  EXPECT_EQ(0, load_observer.session_index_);
+  EXPECT_EQ(&shell()->web_contents()->GetController(),
+            load_observer.controller_);
+}
+
+// See: http://crbug.com/298193
+#if defined(OS_WIN) || defined(OS_LINUX)
+#define MAYBE_DidStopLoadingDetailsWithPending \
+  DISABLED_DidStopLoadingDetailsWithPending
+#else
+#define MAYBE_DidStopLoadingDetailsWithPending DidStopLoadingDetailsWithPending
+#endif
+
+// Test that DidStopLoading includes the correct URL in the details when a
+// pending entry is present.
+IN_PROC_BROWSER_TEST_F(WebContentsImplBrowserTest,
+                       MAYBE_DidStopLoadingDetailsWithPending) {
+  ASSERT_TRUE(embedded_test_server()->Start());
+  GURL url("data:text/html,<div>test</div>");
+
+  // Listen for the first load to stop.
+  LoadStopNotificationObserver load_observer(
+      &shell()->web_contents()->GetController());
+  // Start a new pending navigation as soon as the first load commits.
+  // We will hear a DidStopLoading from the first load as the new load
+  // is started.
+  NavigateOnCommitObserver commit_observer(
+      shell(), embedded_test_server()->GetURL("/title2.html"));
+  NavigateToURL(shell(), url);
+  load_observer.Wait();
+
+  EXPECT_EQ(url, load_observer.url_);
+  EXPECT_EQ(0, load_observer.session_index_);
+  EXPECT_EQ(&shell()->web_contents()->GetController(),
+            load_observer.controller_);
+}
 // Test that a renderer-initiated navigation to an invalid URL does not leave
 // around a pending entry that could be used in a URL spoof.  We test this in
 // a browser test because our unit test framework incorrectly calls
 // DidStartProvisionalLoadForFrame for in-page navigations.
 // See http://crbug.com/280512.
 IN_PROC_BROWSER_TEST_F(WebContentsImplBrowserTest,
                        ClearNonVisiblePendingOnFail) {
   ASSERT_TRUE(embedded_test_server()->Start());
 
   NavigateToURL(shell(), embedded_test_server()->GetURL("/title1.html"));
@@ skipping 556 matching lines @@
     Shell* new_shell = new_shell_observer.GetShell();
     WaitForLoadStop(new_shell->web_contents());
 
     EXPECT_EQ("foo",
               static_cast<WebContentsImpl*>(new_shell->web_contents())
                   ->GetFrameTree()->root()->frame_name());
   }
 }
 
 }  // namespace content