| 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 <stddef.h> | 5 #include <stddef.h> |
| 6 #include <stdint.h> | 6 #include <stdint.h> |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 #include <set> | 9 #include <set> |
| 10 | 10 |
| (...skipping 27 matching lines...) Expand all Loading... |
| 38 #include "content/public/browser/web_ui_message_handler.h" | 38 #include "content/public/browser/web_ui_message_handler.h" |
| 39 #include "content/public/common/bindings_policy.h" | 39 #include "content/public/common/bindings_policy.h" |
| 40 #include "content/public/common/browser_side_navigation_policy.h" | 40 #include "content/public/common/browser_side_navigation_policy.h" |
| 41 #include "content/public/common/content_switches.h" | 41 #include "content/public/common/content_switches.h" |
| 42 #include "content/public/common/page_state.h" | 42 #include "content/public/common/page_state.h" |
| 43 #include "content/public/common/url_constants.h" | 43 #include "content/public/common/url_constants.h" |
| 44 #include "content/public/common/web_preferences.h" | 44 #include "content/public/common/web_preferences.h" |
| 45 #include "content/public/test/browser_test_utils.h" | 45 #include "content/public/test/browser_test_utils.h" |
| 46 #include "content/public/test/content_browser_test.h" | 46 #include "content/public/test/content_browser_test.h" |
| 47 #include "content/public/test/content_browser_test_utils.h" | 47 #include "content/public/test/content_browser_test_utils.h" |
| 48 #include "content/public/test/test_frame_navigation_observer.h" |
| 48 #include "content/public/test/test_navigation_observer.h" | 49 #include "content/public/test/test_navigation_observer.h" |
| 49 #include "content/public/test/test_utils.h" | 50 #include "content/public/test/test_utils.h" |
| 50 #include "content/shell/browser/shell.h" | 51 #include "content/shell/browser/shell.h" |
| 51 #include "content/test/content_browser_test_utils_internal.h" | 52 #include "content/test/content_browser_test_utils_internal.h" |
| 52 #include "content/test/test_frame_navigation_observer.h" | |
| 53 #include "net/dns/mock_host_resolver.h" | 53 #include "net/dns/mock_host_resolver.h" |
| 54 #include "net/test/embedded_test_server/embedded_test_server.h" | 54 #include "net/test/embedded_test_server/embedded_test_server.h" |
| 55 #include "net/test/embedded_test_server/request_handler_util.h" | 55 #include "net/test/embedded_test_server/request_handler_util.h" |
| 56 #include "testing/gmock/include/gmock/gmock-matchers.h" | 56 #include "testing/gmock/include/gmock/gmock-matchers.h" |
| 57 | 57 |
| 58 using base::ASCIIToUTF16; | 58 using base::ASCIIToUTF16; |
| 59 | 59 |
| 60 namespace content { | 60 namespace content { |
| 61 | 61 |
| 62 namespace { | 62 namespace { |
| (...skipping 2878 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2941 // In the bug, after the back navigation the popup was still showing | 2941 // In the bug, after the back navigation the popup was still showing |
| 2942 // the sad tab. Ensure this is not the case. | 2942 // the sad tab. Ensure this is not the case. |
| 2943 EXPECT_EQ(base::TERMINATION_STATUS_STILL_RUNNING, | 2943 EXPECT_EQ(base::TERMINATION_STATUS_STILL_RUNNING, |
| 2944 popup->web_contents()->GetCrashedStatus()); | 2944 popup->web_contents()->GetCrashedStatus()); |
| 2945 EXPECT_TRUE(popup->web_contents()->GetMainFrame()->IsRenderFrameLive()); | 2945 EXPECT_TRUE(popup->web_contents()->GetMainFrame()->IsRenderFrameLive()); |
| 2946 EXPECT_EQ(popup->web_contents()->GetMainFrame()->GetSiteInstance(), | 2946 EXPECT_EQ(popup->web_contents()->GetMainFrame()->GetSiteInstance(), |
| 2947 shell()->web_contents()->GetMainFrame()->GetSiteInstance()); | 2947 shell()->web_contents()->GetMainFrame()->GetSiteInstance()); |
| 2948 } | 2948 } |
| 2949 | 2949 |
| 2950 } // namespace content | 2950 } // namespace content |
| OLD | NEW |