| 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 "base/file_util.h" | 5 #include "base/file_util.h" |
| 6 #include "base/utf_string_conversions.h" | 6 #include "base/utf_string_conversions.h" |
| 7 #include "chrome/browser/ui/browser.h" | 7 #include "chrome/browser/ui/browser.h" |
| 8 #include "chrome/test/base/in_process_browser_test.h" | 8 #include "chrome/test/base/in_process_browser_test.h" |
| 9 #include "chrome/test/base/ui_test_utils.h" | 9 #include "chrome/test/base/ui_test_utils.h" |
| 10 #include "content/public/browser/web_contents.h" | 10 #include "content/public/browser/web_contents.h" |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 if (params.should_update_history) | 24 if (params.should_update_history) |
| 25 update_history_count_++; | 25 update_history_count_++; |
| 26 } | 26 } |
| 27 | 27 |
| 28 int did_navigate_any_frame_count_; | 28 int did_navigate_any_frame_count_; |
| 29 int update_history_count_; | 29 int update_history_count_; |
| 30 }; | 30 }; |
| 31 | 31 |
| 32 IN_PROC_BROWSER_TEST_F(MultipartResponseTest, SingleVisit) { | 32 IN_PROC_BROWSER_TEST_F(MultipartResponseTest, SingleVisit) { |
| 33 // Make sure that visiting a multipart/x-mixed-replace site only | 33 // Make sure that visiting a multipart/x-mixed-replace site only |
| 34 // creates one entry in the visits table. | 34 // creates one entry in the visits table. |
| 35 ASSERT_TRUE(test_server()->Start()); | 35 ASSERT_TRUE(test_server()->Start()); |
| 36 | 36 |
| 37 Observe(browser()->GetSelectedWebContents()); | 37 Observe(browser()->GetSelectedWebContents()); |
| 38 ui_test_utils::NavigateToURL(browser(), test_server()->GetURL("multipart")); | 38 ui_test_utils::NavigateToURL(browser(), test_server()->GetURL("multipart")); |
| 39 | 39 |
| 40 EXPECT_EQ(ASCIIToUTF16("page 9"), | 40 EXPECT_EQ(ASCIIToUTF16("page 9"), |
| 41 browser()->GetSelectedWebContents()->GetTitle()); | 41 browser()->GetSelectedWebContents()->GetTitle()); |
| 42 EXPECT_EQ(1, update_history_count_); | 42 EXPECT_EQ(1, update_history_count_); |
| 43 EXPECT_GT(did_navigate_any_frame_count_, update_history_count_); | 43 EXPECT_GT(did_navigate_any_frame_count_, update_history_count_); |
| 44 } | 44 } |
| OLD | NEW |