Also filter the URLs from incoming non-provisional navigation IPCs.

content/browser/web_contents/web_contents_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/logging.h"
 #include "base/utf_string_conversions.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/renderer_host/test_render_view_host.h"
 #include "content/browser/site_instance_impl.h"
 #include "content/browser/web_contents/interstitial_page_impl.h"
 #include "content/browser/web_contents/navigation_entry_impl.h"
 #include "content/browser/web_contents/test_web_contents.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/interstitial_page_delegate.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/render_widget_host_view.h"
+#include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_ui_controller.h"
 #include "content/public/browser/web_ui_controller_factory.h"
 #include "content/public/common/bindings_policy.h"
 #include "content/public/common/content_constants.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/test/mock_render_process_host.h"
 #include "content/public/test/test_browser_thread.h"
 #include "content/public/test/test_utils.h"
 #include "content/test/test_content_browser_client.h"
 #include "content/test/test_content_client.h"
@@ skipping 255 matching lines @@
  private:
   WebContentsImplTestContentClient client_;
   WebContentsImplTestBrowserClient browser_client_;
   ContentClient* old_client_;
   ContentBrowserClient* old_browser_client_;
   TestBrowserThread ui_thread_;
   TestBrowserThread file_user_blocking_thread_;
   TestBrowserThread io_thread_;
 };
 
+class TestWebContentsObserver : public WebContentsObserver {
+ public:
+  TestWebContentsObserver(WebContents* contents)
+      : WebContentsObserver(contents) {
+  }
+  virtual ~TestWebContentsObserver() {}
+
+  virtual void DidFinishLoad(int64 frame_id,
+                             const GURL& validated_url,
+                             bool is_main_frame,
+                             RenderViewHost* render_view_host) OVERRIDE {
+    last_url_ = validated_url;
+  }
+  virtual void DidFailLoad(int64 frame_id,
+                           const GURL& validated_url,
+                           bool is_main_frame,
+                           int error_code,
+                           const string16& error_description,
+                           RenderViewHost* render_view_host) OVERRIDE {
+    last_url_ = validated_url;
+  }
+
+  const GURL& last_url() const { return last_url_; }
+
+ private:
+  GURL last_url_;
+
+  DISALLOW_COPY_AND_ASSIGN(TestWebContentsObserver);
+};
+
 }  // namespace
 
 // Test to make sure that title updates get stripped of whitespace.
 TEST_F(WebContentsImplTest, UpdateTitle) {
   NavigationControllerImpl& cont =
       static_cast<NavigationControllerImpl&>(controller());
   ViewHostMsg_FrameNavigate_Params params;
   InitNavigateParams(&params, 0, GURL(chrome::kAboutBlankURL),
                      PAGE_TRANSITION_TYPED);
 
@@ skipping 1637 matching lines @@
   EXPECT_TRUE(other_controller.GetTransientEntry());
 
   // And the interstitial should be showing.
   EXPECT_TRUE(other_contents->ShowingInterstitialPage());
 
   // And the interstitial should do a reload on don't proceed.
   EXPECT_TRUE(static_cast<InterstitialPageImpl*>(
       other_contents->GetInterstitialPage())->reload_on_dont_proceed());
 }
 
+// Regression test for http://crbug.com/168611 - the URLs passed by the
+// DidFinishLoad and DidFailLoadWithError IPCs should get filtered.
+TEST_F(WebContentsImplTest, FilterURLs) {
+  TestWebContentsObserver observer(contents());
+
+  // A navigation to about:whatever should always look like a navigation to

[Charlie Reis, 2013/01/07 20:58:46]

I got a bit confused by this comment, since you're actually navigating to
about:blank, not about:whatever.

[jochen (gone - plz use gerrit), 2013/01/07 21:11:59]

Clarified the comment

+  // about:blank
+  GURL url_normalized("about:blank");
+  GURL url_from_ipc("about:whatever");
+  contents()->NavigateAndCommit(url_normalized);
+
+  // Check that an IPC with about:whatever is correctly normalized.
+  contents()->TestDidFinishLoad(1, url_from_ipc, true);
+
+  EXPECT_EQ(url_normalized, observer.last_url());
+
+  // Create and navigate another WebContents.
+  scoped_ptr<TestWebContents> other_contents(
+      static_cast<TestWebContents*>(CreateTestWebContents()));
+  TestWebContentsObserver other_observer(other_contents.get());
+  other_contents->NavigateAndCommit(url_normalized);
+
+  // Check that an IPC with about:whatever is correctly normalized.
+  other_contents->TestDidFailLoadWithError(
+      1, url_from_ipc, true, 1, string16());
+  EXPECT_EQ(url_normalized, other_observer.last_url());
+}
+
+
 }  // namespace content