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 <deque> | 5 #include <deque> |
6 #include <vector> | 6 #include <vector> |
7 | 7 |
8 #include "base/bind.h" | 8 #include "base/bind.h" |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
(...skipping 3428 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3439 void SetUpInProcessBrowserTestFixture() override { | 3439 void SetUpInProcessBrowserTestFixture() override { |
3440 PrerenderBrowserTest::SetUpInProcessBrowserTestFixture(); | 3440 PrerenderBrowserTest::SetUpInProcessBrowserTestFixture(); |
3441 ExtensionApiTest::SetUpInProcessBrowserTestFixture(); | 3441 ExtensionApiTest::SetUpInProcessBrowserTestFixture(); |
3442 } | 3442 } |
3443 | 3443 |
3444 void TearDownInProcessBrowserTestFixture() override { | 3444 void TearDownInProcessBrowserTestFixture() override { |
3445 PrerenderBrowserTest::TearDownInProcessBrowserTestFixture(); | 3445 PrerenderBrowserTest::TearDownInProcessBrowserTestFixture(); |
3446 ExtensionApiTest::TearDownInProcessBrowserTestFixture(); | 3446 ExtensionApiTest::TearDownInProcessBrowserTestFixture(); |
3447 } | 3447 } |
3448 | 3448 |
| 3449 void TearDownOnMainThread() override { |
| 3450 PrerenderBrowserTest::TearDownOnMainThread(); |
| 3451 ExtensionApiTest::TearDownOnMainThread(); |
| 3452 } |
| 3453 |
3449 void SetUpOnMainThread() override { | 3454 void SetUpOnMainThread() override { |
3450 PrerenderBrowserTest::SetUpOnMainThread(); | 3455 PrerenderBrowserTest::SetUpOnMainThread(); |
3451 } | 3456 } |
3452 }; | 3457 }; |
3453 | 3458 |
3454 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTestWithExtensions, WebNavigation) { | 3459 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTestWithExtensions, WebNavigation) { |
3455 ASSERT_TRUE(StartSpawnedTestServer()); | 3460 ASSERT_TRUE(StartSpawnedTestServer()); |
3456 extensions::FrameNavigationState::set_allow_extension_scheme(true); | 3461 extensions::FrameNavigationState::set_allow_extension_scheme(true); |
3457 | 3462 |
3458 // Wait for the extension to set itself up and return control to us. | 3463 // Wait for the extension to set itself up and return control to us. |
(...skipping 682 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4141 | 4146 |
4142 NavigateToDestURL(); | 4147 NavigateToDestURL(); |
4143 EXPECT_EQ(1U, task_manager.tasks().size()); | 4148 EXPECT_EQ(1U, task_manager.tasks().size()); |
4144 } | 4149 } |
4145 | 4150 |
4146 } // namespace | 4151 } // namespace |
4147 | 4152 |
4148 #endif // defined(ENABLE_TASK_MANAGER) | 4153 #endif // defined(ENABLE_TASK_MANAGER) |
4149 | 4154 |
4150 } // namespace prerender | 4155 } // namespace prerender |
OLD | NEW |