| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/test/test_web_contents.h" | 5 #include "content/test/test_web_contents.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "content/browser/browser_url_handler_impl.h" | 9 #include "content/browser/browser_url_handler_impl.h" |
| 10 #include "content/browser/frame_host/cross_process_frame_connector.h" | 10 #include "content/browser/frame_host/cross_process_frame_connector.h" |
| (...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 200 const SiteInstance* site_instance, int history_length, | 200 const SiteInstance* site_instance, int history_length, |
| 201 int32 min_page_id) { | 201 int32 min_page_id) { |
| 202 EXPECT_TRUE(expect_set_history_length_and_prune_); | 202 EXPECT_TRUE(expect_set_history_length_and_prune_); |
| 203 expect_set_history_length_and_prune_ = false; | 203 expect_set_history_length_and_prune_ = false; |
| 204 EXPECT_EQ(expect_set_history_length_and_prune_site_instance_, site_instance); | 204 EXPECT_EQ(expect_set_history_length_and_prune_site_instance_, site_instance); |
| 205 EXPECT_EQ(expect_set_history_length_and_prune_history_length_, | 205 EXPECT_EQ(expect_set_history_length_and_prune_history_length_, |
| 206 history_length); | 206 history_length); |
| 207 EXPECT_EQ(expect_set_history_length_and_prune_min_page_id_, min_page_id); | 207 EXPECT_EQ(expect_set_history_length_and_prune_min_page_id_, min_page_id); |
| 208 } | 208 } |
| 209 | 209 |
| 210 void TestWebContents::TestDidFinishLoad(int64 frame_id, | 210 void TestWebContents::TestDidFinishLoad(const GURL& url, |
| 211 const GURL& url, | |
| 212 bool is_main_frame) { | 211 bool is_main_frame) { |
| 213 ViewHostMsg_DidFinishLoad msg(0, frame_id, url, is_main_frame); | 212 FrameHostMsg_DidFinishLoad msg(0, url, is_main_frame); |
| 214 OnMessageReceived(GetRenderViewHost(), msg); | 213 frame_tree_.root()->current_frame_host()->OnMessageReceived(msg); |
| 215 } | 214 } |
| 216 | 215 |
| 217 void TestWebContents::TestDidFailLoadWithError( | 216 void TestWebContents::TestDidFailLoadWithError( |
| 218 const GURL& url, | 217 const GURL& url, |
| 219 bool is_main_frame, | 218 bool is_main_frame, |
| 220 int error_code, | 219 int error_code, |
| 221 const base::string16& error_description) { | 220 const base::string16& error_description) { |
| 222 FrameHostMsg_DidFailLoadWithError msg( | 221 FrameHostMsg_DidFailLoadWithError msg( |
| 223 0, url, is_main_frame, error_code, error_description); | 222 0, url, is_main_frame, error_code, error_description); |
| 224 frame_tree_.root()->current_frame_host()->OnMessageReceived(msg); | 223 frame_tree_.root()->current_frame_host()->OnMessageReceived(msg); |
| (...skipping 23 matching lines...) Expand all Loading... |
| 248 } | 247 } |
| 249 | 248 |
| 250 void TestWebContents::ShowCreatedWidget(int route_id, | 249 void TestWebContents::ShowCreatedWidget(int route_id, |
| 251 const gfx::Rect& initial_pos) { | 250 const gfx::Rect& initial_pos) { |
| 252 } | 251 } |
| 253 | 252 |
| 254 void TestWebContents::ShowCreatedFullscreenWidget(int route_id) { | 253 void TestWebContents::ShowCreatedFullscreenWidget(int route_id) { |
| 255 } | 254 } |
| 256 | 255 |
| 257 } // namespace content | 256 } // namespace content |
| OLD | NEW |