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

Side by Side Diff: content/browser/frame_host/navigation_handle_impl_unittest.cc

Issue 2374863002: Remove usage of HostZoomMap from c/b/loader via ReadyToCommitNavigation (Closed)
Patch Set: init Created 4 years, 1 month 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 unified diff | Download patch
« no previous file with comments | « content/browser/BUILD.gn ('k') | content/browser/host_zoom_map_impl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/macros.h" 5 #include "base/macros.h"
6 #include "content/browser/frame_host/navigation_handle_impl.h" 6 #include "content/browser/frame_host/navigation_handle_impl.h"
7 #include "content/public/browser/navigation_throttle.h" 7 #include "content/public/browser/navigation_throttle.h"
8 #include "content/public/browser/ssl_status.h" 8 #include "content/public/browser/ssl_status.h"
9 #include "content/public/common/request_context_type.h" 9 #include "content/public/common/request_context_type.h"
10 #include "content/test/test_render_frame_host.h" 10 #include "content/test/test_render_frame_host.h"
11 #include "content/test/test_web_contents.h"
11 12
12 namespace content { 13 namespace content {
13 14
14 // Test version of a NavigationThrottle. It will always return the current 15 // Test version of a NavigationThrottle. It will always return the current
15 // NavigationThrottle::ThrottleCheckResult |result_|, It also monitors the 16 // NavigationThrottle::ThrottleCheckResult |result_|, It also monitors the
16 // number of times WillStartRequest, WillRedirectRequest, and 17 // number of times WillStartRequest, WillRedirectRequest, and
17 // WillProcessResponse were called. 18 // WillProcessResponse were called.
18 class TestNavigationThrottle : public NavigationThrottle { 19 class TestNavigationThrottle : public NavigationThrottle {
19 public: 20 public:
20 TestNavigationThrottle(NavigationHandle* handle, 21 TestNavigationThrottle(NavigationHandle* handle,
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 : was_callback_called_(false), 65 : was_callback_called_(false),
65 callback_result_(NavigationThrottle::DEFER) {} 66 callback_result_(NavigationThrottle::DEFER) {}
66 67
67 void SetUp() override { 68 void SetUp() override {
68 RenderViewHostImplTestHarness::SetUp(); 69 RenderViewHostImplTestHarness::SetUp();
69 test_handle_ = NavigationHandleImpl::Create( 70 test_handle_ = NavigationHandleImpl::Create(
70 GURL(), main_test_rfh()->frame_tree_node(), true, false, false, 71 GURL(), main_test_rfh()->frame_tree_node(), true, false, false,
71 base::TimeTicks::Now(), 0, false); 72 base::TimeTicks::Now(), 0, false);
72 EXPECT_EQ(REQUEST_CONTEXT_TYPE_UNSPECIFIED, 73 EXPECT_EQ(REQUEST_CONTEXT_TYPE_UNSPECIFIED,
73 test_handle_->request_context_type_); 74 test_handle_->request_context_type_);
75 contents()->GetMainFrame()->InitializeRenderFrameIfNeeded();
74 } 76 }
75 77
76 void TearDown() override { 78 void TearDown() override {
77 // Release the |test_handle_| before destroying the WebContents, to match 79 // Release the |test_handle_| before destroying the WebContents, to match
78 // the WebContentsObserverSanityChecker expectations. 80 // the WebContentsObserverSanityChecker expectations.
79 test_handle_.reset(); 81 test_handle_.reset();
80 RenderViewHostImplTestHarness::TearDown(); 82 RenderViewHostImplTestHarness::TearDown();
81 } 83 }
82 84
83 bool IsDeferringStart() { 85 bool IsDeferringStart() {
(...skipping 579 matching lines...) Expand 10 before | Expand all | Expand 10 after
663 EXPECT_EQ(NavigationThrottle::CANCEL_AND_IGNORE, callback_result()); 665 EXPECT_EQ(NavigationThrottle::CANCEL_AND_IGNORE, callback_result());
664 EXPECT_EQ(0, cancel_throttle->will_start_calls()); 666 EXPECT_EQ(0, cancel_throttle->will_start_calls());
665 EXPECT_EQ(0, cancel_throttle->will_redirect_calls()); 667 EXPECT_EQ(0, cancel_throttle->will_redirect_calls());
666 EXPECT_EQ(1, cancel_throttle->will_process_response_calls()); 668 EXPECT_EQ(1, cancel_throttle->will_process_response_calls());
667 EXPECT_EQ(0, proceed_throttle->will_start_calls()); 669 EXPECT_EQ(0, proceed_throttle->will_start_calls());
668 EXPECT_EQ(0, proceed_throttle->will_redirect_calls()); 670 EXPECT_EQ(0, proceed_throttle->will_redirect_calls());
669 EXPECT_EQ(0, proceed_throttle->will_process_response_calls()); 671 EXPECT_EQ(0, proceed_throttle->will_process_response_calls());
670 } 672 }
671 673
672 } // namespace content 674 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/BUILD.gn ('k') | content/browser/host_zoom_map_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698