| 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 566 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 577 "pass - part3 - rolled back"); | 577 "pass - part3 - rolled back"); |
| 578 } | 578 } |
| 579 | 579 |
| 580 // Verify that open DB connections are closed when a tab is destroyed. | 580 // Verify that open DB connections are closed when a tab is destroyed. |
| 581 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, ConnectionsClosedOnTabClose) { | 581 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, ConnectionsClosedOnTabClose) { |
| 582 NavigateAndWaitForTitle(shell(), "version_change_blocked.html", "#tab1", | 582 NavigateAndWaitForTitle(shell(), "version_change_blocked.html", "#tab1", |
| 583 "setVersion(2) complete"); | 583 "setVersion(2) complete"); |
| 584 | 584 |
| 585 // Start on a different URL to force a new renderer process. | 585 // Start on a different URL to force a new renderer process. |
| 586 Shell* new_shell = CreateBrowser(); | 586 Shell* new_shell = CreateBrowser(); |
| 587 NavigateToURL(new_shell, GURL(kAboutBlankURL)); | 587 NavigateToURL(new_shell, GURL(url::kAboutBlankURL)); |
| 588 NavigateAndWaitForTitle(new_shell, "version_change_blocked.html", "#tab2", | 588 NavigateAndWaitForTitle(new_shell, "version_change_blocked.html", "#tab2", |
| 589 "setVersion(3) blocked"); | 589 "setVersion(3) blocked"); |
| 590 | 590 |
| 591 base::string16 expected_title16(ASCIIToUTF16("setVersion(3) complete")); | 591 base::string16 expected_title16(ASCIIToUTF16("setVersion(3) complete")); |
| 592 TitleWatcher title_watcher(new_shell->web_contents(), expected_title16); | 592 TitleWatcher title_watcher(new_shell->web_contents(), expected_title16); |
| 593 | 593 |
| 594 base::KillProcess( | 594 base::KillProcess( |
| 595 shell()->web_contents()->GetRenderProcessHost()->GetHandle(), 0, true); | 595 shell()->web_contents()->GetRenderProcessHost()->GetHandle(), 0, true); |
| 596 shell()->Close(); | 596 shell()->Close(); |
| 597 | 597 |
| (...skipping 30 matching lines...) Expand all Loading... |
| 628 #define MAYBE_RenderThreadShutdownTest DISABLED_RenderThreadShutdownTest | 628 #define MAYBE_RenderThreadShutdownTest DISABLED_RenderThreadShutdownTest |
| 629 #else | 629 #else |
| 630 #define MAYBE_RenderThreadShutdownTest RenderThreadShutdownTest | 630 #define MAYBE_RenderThreadShutdownTest RenderThreadShutdownTest |
| 631 #endif | 631 #endif |
| 632 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTestSingleProcess, | 632 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTestSingleProcess, |
| 633 MAYBE_RenderThreadShutdownTest) { | 633 MAYBE_RenderThreadShutdownTest) { |
| 634 SimpleTest(GetTestUrl("indexeddb", "shutdown_with_requests.html")); | 634 SimpleTest(GetTestUrl("indexeddb", "shutdown_with_requests.html")); |
| 635 } | 635 } |
| 636 | 636 |
| 637 } // namespace content | 637 } // namespace content |
| OLD | NEW |