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