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

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

Issue 2315443003: Stop sending serialized SSLStatus to the renderer. (Closed)
Patch Set: self review fix and merge fix Created 4 years, 3 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
« no previous file with comments | « content/browser/frame_host/navigation_controller_impl.cc ('k') | content/browser/loader/DEPS » ('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 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/navigation_controller_impl.h" 5 #include "content/browser/frame_host/navigation_controller_impl.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 14 matching lines...) Expand all
25 #include "content/browser/frame_host/navigation_entry_impl.h" 25 #include "content/browser/frame_host/navigation_entry_impl.h"
26 #include "content/browser/frame_host/navigation_entry_screenshot_manager.h" 26 #include "content/browser/frame_host/navigation_entry_screenshot_manager.h"
27 #include "content/browser/frame_host/navigation_request.h" 27 #include "content/browser/frame_host/navigation_request.h"
28 #include "content/browser/frame_host/navigator.h" 28 #include "content/browser/frame_host/navigator.h"
29 #include "content/browser/frame_host/navigator_impl.h" 29 #include "content/browser/frame_host/navigator_impl.h"
30 #include "content/browser/site_instance_impl.h" 30 #include "content/browser/site_instance_impl.h"
31 #include "content/browser/web_contents/web_contents_impl.h" 31 #include "content/browser/web_contents/web_contents_impl.h"
32 #include "content/common/frame_messages.h" 32 #include "content/common/frame_messages.h"
33 #include "content/common/frame_owner_properties.h" 33 #include "content/common/frame_owner_properties.h"
34 #include "content/common/site_isolation_policy.h" 34 #include "content/common/site_isolation_policy.h"
35 #include "content/common/ssl_status_serialization.h"
36 #include "content/common/view_messages.h" 35 #include "content/common/view_messages.h"
37 #include "content/public/browser/navigation_details.h" 36 #include "content/public/browser/navigation_details.h"
38 #include "content/public/browser/notification_registrar.h" 37 #include "content/public/browser/notification_registrar.h"
39 #include "content/public/browser/notification_types.h" 38 #include "content/public/browser/notification_types.h"
40 #include "content/public/browser/render_view_host.h" 39 #include "content/public/browser/render_view_host.h"
41 #include "content/public/browser/web_contents_delegate.h" 40 #include "content/public/browser/web_contents_delegate.h"
42 #include "content/public/browser/web_contents_observer.h" 41 #include "content/public/browser/web_contents_observer.h"
43 #include "content/public/common/browser_side_navigation_policy.h" 42 #include "content/public/common/browser_side_navigation_policy.h"
44 #include "content/public/common/page_state.h" 43 #include "content/public/common/page_state.h"
45 #include "content/public/common/page_type.h" 44 #include "content/public/common/page_type.h"
(...skipping 5272 matching lines...) Expand 10 before | Expand all | Expand 10 after
5318 // means that occasionally a navigation conflict will end up with one entry 5317 // means that occasionally a navigation conflict will end up with one entry
5319 // bubbling to the end of the entry list, but that's the least-bad option. 5318 // bubbling to the end of the entry list, but that's the least-bad option.
5320 EXPECT_EQ(3, controller.GetEntryCount()); 5319 EXPECT_EQ(3, controller.GetEntryCount());
5321 EXPECT_EQ(2, controller.GetCurrentEntryIndex()); 5320 EXPECT_EQ(2, controller.GetCurrentEntryIndex());
5322 EXPECT_EQ(url_a, controller.GetEntryAtIndex(0)->GetURL()); 5321 EXPECT_EQ(url_a, controller.GetEntryAtIndex(0)->GetURL());
5323 EXPECT_EQ(url_c, controller.GetEntryAtIndex(1)->GetURL()); 5322 EXPECT_EQ(url_c, controller.GetEntryAtIndex(1)->GetURL());
5324 EXPECT_EQ(url_b, controller.GetEntryAtIndex(2)->GetURL()); 5323 EXPECT_EQ(url_b, controller.GetEntryAtIndex(2)->GetURL());
5325 } 5324 }
5326 5325
5327 } // namespace content 5326 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/frame_host/navigation_controller_impl.cc ('k') | content/browser/loader/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698