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

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

Issue 2321543002: Merge CrossSiteResourceHandler and NavigationResourceThrottle (Closed)
Patch Set: Addressed nits Created 4 years, 2 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "content/browser/frame_host/render_frame_host_manager.h" 5 #include "content/browser/frame_host/render_frame_host_manager.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <tuple> 9 #include <tuple>
10 #include <utility> 10 #include <utility>
11 11
12 #include "base/command_line.h" 12 #include "base/command_line.h"
13 #include "base/files/file_path.h" 13 #include "base/files/file_path.h"
14 #include "base/macros.h" 14 #include "base/macros.h"
15 #include "base/memory/ptr_util.h" 15 #include "base/memory/ptr_util.h"
16 #include "base/strings/utf_string_conversions.h" 16 #include "base/strings/utf_string_conversions.h"
17 #include "base/test/histogram_tester.h" 17 #include "base/test/histogram_tester.h"
18 #include "base/time/time.h" 18 #include "base/time/time.h"
19 #include "build/build_config.h" 19 #include "build/build_config.h"
20 #include "content/browser/frame_host/cross_site_transferring_request.h"
21 #include "content/browser/frame_host/navigation_controller_impl.h" 20 #include "content/browser/frame_host/navigation_controller_impl.h"
22 #include "content/browser/frame_host/navigation_entry_impl.h" 21 #include "content/browser/frame_host/navigation_entry_impl.h"
23 #include "content/browser/frame_host/navigation_request.h" 22 #include "content/browser/frame_host/navigation_request.h"
24 #include "content/browser/frame_host/navigator.h" 23 #include "content/browser/frame_host/navigator.h"
25 #include "content/browser/frame_host/render_frame_proxy_host.h" 24 #include "content/browser/frame_host/render_frame_proxy_host.h"
26 #include "content/browser/site_instance_impl.h" 25 #include "content/browser/site_instance_impl.h"
27 #include "content/browser/webui/web_ui_controller_factory_registry.h" 26 #include "content/browser/webui/web_ui_controller_factory_registry.h"
28 #include "content/common/frame_messages.h" 27 #include "content/common/frame_messages.h"
29 #include "content/common/frame_owner_properties.h" 28 #include "content/common/frame_owner_properties.h"
30 #include "content/common/input_messages.h" 29 #include "content/common/input_messages.h"
(...skipping 3061 matching lines...) Expand 10 before | Expand all | Expand 10 after
3092 child_host->SendNavigateWithParams(&commit_params); 3091 child_host->SendNavigateWithParams(&commit_params);
3093 EXPECT_NO_FATAL_FAILURE(CheckInsecureRequestPolicyIPC( 3092 EXPECT_NO_FATAL_FAILURE(CheckInsecureRequestPolicyIPC(
3094 main_test_rfh(), blink::kLeaveInsecureRequestsAlone, 3093 main_test_rfh(), blink::kLeaveInsecureRequestsAlone,
3095 proxy_to_parent->GetRoutingID())); 3094 proxy_to_parent->GetRoutingID()));
3096 EXPECT_EQ( 3095 EXPECT_EQ(
3097 blink::kLeaveInsecureRequestsAlone, 3096 blink::kLeaveInsecureRequestsAlone,
3098 root->child_at(0)->current_replication_state().insecure_request_policy); 3097 root->child_at(0)->current_replication_state().insecure_request_policy);
3099 } 3098 }
3100 3099
3101 } // namespace content 3100 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/frame_host/render_frame_host_manager.cc ('k') | content/browser/loader/cross_site_resource_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698