Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(252)

Unified Diff: content/browser/transition_browsertest.cc

Issue 297973002: Navigation transitions: Block first response until after transitions have run. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changes from review. Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/transition_browsertest.cc
diff --git a/content/browser/transition_browsertest.cc b/content/browser/transition_browsertest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..29fca1a8efd62a05578eb7e639df4663e4431e26
--- /dev/null
+++ b/content/browser/transition_browsertest.cc
@@ -0,0 +1,130 @@
+// 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 "content/browser/loader/cross_site_resource_handler.h"
+#include "content/browser/loader/resource_dispatcher_host_impl.h"
+#include "content/browser/loader/resource_request_info_impl.h"
+#include "content/browser/transition_request_manager.h"
+#include "content/browser/web_contents/web_contents_impl.h"
+#include "content/public/browser/web_contents_observer.h"
+#include "content/public/test/content_browser_test.h"
+#include "content/public/test/content_browser_test_utils.h"
+#include "content/public/test/test_utils.h"
+#include "content/shell/browser/shell.h"
+#include "content/shell/browser/shell_resource_dispatcher_host_delegate.h"
+#include "net/test/embedded_test_server/embedded_test_server.h"
+#include "net/url_request/url_request.h"
+
+namespace content {
+
+class TransitionBrowserTest : public ContentBrowserTest {
+ public:
+ TransitionBrowserTest() {}
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(TransitionBrowserTest);
+};
+
+class TransitionBrowserTestObserver
+ : public WebContentsObserver,
+ public ShellResourceDispatcherHostDelegate {
+ public:
+ TransitionBrowserTestObserver(Shell* shell)
+ : WebContentsObserver(shell->web_contents()),
+ request_(NULL),
+ shell_(shell),
+ provisional_load_started_(false),
+ did_defer_response_(false),
+ is_transition_request_(false) {}
+
+ virtual void RequestBeginning(
+ net::URLRequest* request,
+ ResourceContext* resource_context,
+ appcache::AppCacheService* appcache_service,
+ ResourceType::Type resource_type,
+ int child_id,
+ int route_id,
+ ScopedVector<ResourceThrottle>* throttles) OVERRIDE {
+ CHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+ ShellResourceDispatcherHostDelegate::RequestBeginning(request,
+ resource_context,
+ appcache_service,
+ resource_type,
+ child_id,
+ route_id,
+ throttles);
+ request_ = request;
+ }
+
+ virtual void DidStartProvisionalLoadForFrame(
+ int64 frame_id,
+ int64 parent_frame_id,
+ bool is_main_frame,
+ const GURL& validated_url,
+ bool is_error_page,
+ bool is_iframe_srcdoc,
+ RenderViewHost* render_view_host) OVERRIDE {
+ CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ provisional_load_started_ = true;
+ shell_->web_contents()->SetHasPendingTransitionRequest(
+ is_transition_request_);
+ }
+
+ virtual void DidDeferAfterResponseStarted() OVERRIDE {
+ CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ ASSERT_TRUE(provisional_load_started_);
+ did_defer_response_ = true;
+
+ // Check that the request is currently blocked
+ ResourceRequestInfoImpl* info =
+ ResourceRequestInfoImpl::ForRequest(request_);
+
+ ASSERT_TRUE(info->cross_site_handler()->is_deferred_for_testing());
+
+ shell_->web_contents()->ResumeResponseDeferredAtStart();
+ }
+
+ void set_pending_transition_request(bool is_transition_request) {
+ is_transition_request_ = is_transition_request;
+ }
+
+ bool did_defer_response() const { return did_defer_response_; }
+
+ private:
+ net::URLRequest* request_;
+ Shell* shell_;
+ bool provisional_load_started_;
+ bool did_defer_response_;
+ bool is_transition_request_;
+};
+
+// This tests that DidDeferAfterResponseStarted is not called on normal
+// navigations.
+IN_PROC_BROWSER_TEST_F(TransitionBrowserTest,
+ DidDeferAfterResponseStartedNotCalled) {
+ ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
+ scoped_ptr<TransitionBrowserTestObserver> observer(
+ new TransitionBrowserTestObserver(shell()));
+
+ NavigateToURL(shell(), embedded_test_server()->GetURL("/title1.html"));
+
+ ASSERT_FALSE(observer->did_defer_response());
+}
+
+// This tests that DidDeferAfterResponseStarted is called on a transition
+// navigation, and that the request is deferred.
+IN_PROC_BROWSER_TEST_F(TransitionBrowserTest, ShouldDeferAtFirstResponse) {
+ ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
+ scoped_ptr<TransitionBrowserTestObserver> observer(
+ new TransitionBrowserTestObserver(shell()));
+
+ ResourceDispatcherHost::Get()->SetDelegate(observer.get());
+ observer->set_pending_transition_request(true);
+
+ NavigateToURL(shell(), embedded_test_server()->GetURL("/title1.html"));
+
+ ASSERT_TRUE(observer->did_defer_response());
+}
+
+} // namespace content

Powered by Google App Engine
This is Rietveld 408576698