| OLD | NEW |
| 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> |
| 11 #include <tuple> |
| 11 #include <utility> | 12 #include <utility> |
| 12 | 13 |
| 13 #include "base/bind.h" | 14 #include "base/bind.h" |
| 14 #include "base/files/file_util.h" | 15 #include "base/files/file_util.h" |
| 15 #include "base/macros.h" | 16 #include "base/macros.h" |
| 16 #include "base/memory/ptr_util.h" | 17 #include "base/memory/ptr_util.h" |
| 17 #include "base/stl_util.h" | 18 #include "base/stl_util.h" |
| 18 #include "base/strings/string_util.h" | 19 #include "base/strings/string_util.h" |
| 19 #include "base/strings/utf_string_conversions.h" | 20 #include "base/strings/utf_string_conversions.h" |
| 20 #include "base/time/time.h" | 21 #include "base/time/time.h" |
| (...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 240 const GURL GetLastNavigationURL() { | 241 const GURL GetLastNavigationURL() { |
| 241 if (IsBrowserSideNavigationEnabled()) { | 242 if (IsBrowserSideNavigationEnabled()) { |
| 242 NavigationRequest* navigation_request = | 243 NavigationRequest* navigation_request = |
| 243 contents()->GetFrameTree()->root()->navigation_request(); | 244 contents()->GetFrameTree()->root()->navigation_request(); |
| 244 CHECK(navigation_request); | 245 CHECK(navigation_request); |
| 245 return navigation_request->common_params().url; | 246 return navigation_request->common_params().url; |
| 246 } | 247 } |
| 247 const IPC::Message* message = | 248 const IPC::Message* message = |
| 248 process()->sink().GetFirstMessageMatching(FrameMsg_Navigate::ID); | 249 process()->sink().GetFirstMessageMatching(FrameMsg_Navigate::ID); |
| 249 CHECK(message); | 250 CHECK(message); |
| 250 base::Tuple<CommonNavigationParams, StartNavigationParams, | 251 std::tuple<CommonNavigationParams, StartNavigationParams, |
| 251 RequestNavigationParams> nav_params; | 252 RequestNavigationParams> |
| 253 nav_params; |
| 252 FrameMsg_Navigate::Read(message, &nav_params); | 254 FrameMsg_Navigate::Read(message, &nav_params); |
| 253 return base::get<0>(nav_params).url; | 255 return std::get<0>(nav_params).url; |
| 254 } | 256 } |
| 255 | 257 |
| 256 protected: | 258 protected: |
| 257 GURL navigated_url_; | 259 GURL navigated_url_; |
| 258 size_t navigation_entry_committed_counter_; | 260 size_t navigation_entry_committed_counter_; |
| 259 }; | 261 }; |
| 260 | 262 |
| 261 void RegisterForAllNavNotifications(TestNotificationTracker* tracker, | 263 void RegisterForAllNavNotifications(TestNotificationTracker* tracker, |
| 262 NavigationController* controller) { | 264 NavigationController* controller) { |
| 263 tracker->ListenFor(NOTIFICATION_NAV_LIST_PRUNED, | 265 tracker->ListenFor(NOTIFICATION_NAV_LIST_PRUNED, |
| (...skipping 5061 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5325 observer.details().ssl_status.num_unknown_scts); | 5327 observer.details().ssl_status.num_unknown_scts); |
| 5326 EXPECT_EQ(default_ssl_status.num_invalid_scts, | 5328 EXPECT_EQ(default_ssl_status.num_invalid_scts, |
| 5327 observer.details().ssl_status.num_invalid_scts); | 5329 observer.details().ssl_status.num_invalid_scts); |
| 5328 EXPECT_EQ(default_ssl_status.num_valid_scts, | 5330 EXPECT_EQ(default_ssl_status.num_valid_scts, |
| 5329 observer.details().ssl_status.num_valid_scts); | 5331 observer.details().ssl_status.num_valid_scts); |
| 5330 | 5332 |
| 5331 EXPECT_EQ(1, main_test_rfh()->GetProcess()->bad_msg_count()); | 5333 EXPECT_EQ(1, main_test_rfh()->GetProcess()->bad_msg_count()); |
| 5332 } | 5334 } |
| 5333 | 5335 |
| 5334 } // namespace content | 5336 } // namespace content |
| OLD | NEW |