| 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/bind.h" | 5 #include "base/bind.h" |
| 6 #include "base/command_line.h" | 6 #include "base/command_line.h" |
| 7 #include "base/file_util.h" | 7 #include "base/file_util.h" |
| 8 #include "base/files/file.h" | 8 #include "base/files/file.h" |
| 9 #include "base/files/file_enumerator.h" | 9 #include "base/files/file_enumerator.h" |
| 10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
| (...skipping 551 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 562 "pass - part3 - rolled back"); | 562 "pass - part3 - rolled back"); |
| 563 } | 563 } |
| 564 | 564 |
| 565 // Verify that open DB connections are closed when a tab is destroyed. | 565 // Verify that open DB connections are closed when a tab is destroyed. |
| 566 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, ConnectionsClosedOnTabClose) { | 566 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, ConnectionsClosedOnTabClose) { |
| 567 NavigateAndWaitForTitle(shell(), "version_change_blocked.html", "#tab1", | 567 NavigateAndWaitForTitle(shell(), "version_change_blocked.html", "#tab1", |
| 568 "setVersion(2) complete"); | 568 "setVersion(2) complete"); |
| 569 | 569 |
| 570 // Start on a different URL to force a new renderer process. | 570 // Start on a different URL to force a new renderer process. |
| 571 Shell* new_shell = CreateBrowser(); | 571 Shell* new_shell = CreateBrowser(); |
| 572 NavigateToURL(new_shell, GURL(kAboutBlankURL)); | 572 NavigateToURL(new_shell, GURL(url::kAboutBlankURL)); |
| 573 NavigateAndWaitForTitle(new_shell, "version_change_blocked.html", "#tab2", | 573 NavigateAndWaitForTitle(new_shell, "version_change_blocked.html", "#tab2", |
| 574 "setVersion(3) blocked"); | 574 "setVersion(3) blocked"); |
| 575 | 575 |
| 576 base::string16 expected_title16(ASCIIToUTF16("setVersion(3) complete")); | 576 base::string16 expected_title16(ASCIIToUTF16("setVersion(3) complete")); |
| 577 TitleWatcher title_watcher(new_shell->web_contents(), expected_title16); | 577 TitleWatcher title_watcher(new_shell->web_contents(), expected_title16); |
| 578 | 578 |
| 579 base::KillProcess( | 579 base::KillProcess( |
| 580 shell()->web_contents()->GetRenderProcessHost()->GetHandle(), 0, true); | 580 shell()->web_contents()->GetRenderProcessHost()->GetHandle(), 0, true); |
| 581 shell()->Close(); | 581 shell()->Close(); |
| 582 | 582 |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 614 #define MAYBE_RenderThreadShutdownTest DISABLED_RenderThreadShutdownTest | 614 #define MAYBE_RenderThreadShutdownTest DISABLED_RenderThreadShutdownTest |
| 615 #else | 615 #else |
| 616 #define MAYBE_RenderThreadShutdownTest RenderThreadShutdownTest | 616 #define MAYBE_RenderThreadShutdownTest RenderThreadShutdownTest |
| 617 #endif | 617 #endif |
| 618 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTestSingleProcess, | 618 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTestSingleProcess, |
| 619 MAYBE_RenderThreadShutdownTest) { | 619 MAYBE_RenderThreadShutdownTest) { |
| 620 SimpleTest(GetTestUrl("indexeddb", "shutdown_with_requests.html")); | 620 SimpleTest(GetTestUrl("indexeddb", "shutdown_with_requests.html")); |
| 621 } | 621 } |
| 622 | 622 |
| 623 } // namespace content | 623 } // namespace content |
| OLD | NEW |