diff options
Diffstat (limited to 'chromium/content/browser/indexed_db/indexed_db_browsertest.cc')
| -rw-r--r-- | chromium/content/browser/indexed_db/indexed_db_browsertest.cc | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/chromium/content/browser/indexed_db/indexed_db_browsertest.cc b/chromium/content/browser/indexed_db/indexed_db_browsertest.cc index ab010cbd92a..fb6d0cd2795 100644 --- a/chromium/content/browser/indexed_db/indexed_db_browsertest.cc +++ b/chromium/content/browser/indexed_db/indexed_db_browsertest.cc @@ -21,7 +21,7 @@ #include "content/public/common/content_switches.h" #include "content/public/common/url_constants.h" #include "content/public/test/browser_test_utils.h" -#include "content/shell/shell.h" +#include "content/shell/browser/shell.h" #include "content/test/content_browser_test.h" #include "content/test/content_browser_test_utils.h" #include "webkit/browser/database/database_util.h" @@ -46,7 +46,8 @@ class IndexedDBBrowserTest : public ContentBrowserTest { LOG(INFO) << "Navigating to URL and blocking."; NavigateToURLBlockUntilNavigationsComplete(the_browser, test_url, 2); LOG(INFO) << "Navigation done."; - std::string result = the_browser->web_contents()->GetURL().ref(); + std::string result = + the_browser->web_contents()->GetLastCommittedURL().ref(); if (result != "pass") { std::string js_result; ASSERT_TRUE(ExecuteScriptAndExtractString( @@ -430,4 +431,16 @@ IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, ForceCloseEventTest) { EXPECT_EQ(expected_title16, title_watcher.WaitAndGetTitle()); } +class IndexedDBBrowserTestSingleProcess : public IndexedDBBrowserTest { + public: + virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + command_line->AppendSwitch(switches::kSingleProcess); + } +}; + +IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTestSingleProcess, + RenderThreadShutdownTest) { + SimpleTest(GetTestUrl("indexeddb", "shutdown_with_requests.html")); +} + } // namespace content |