| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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/file_path.h" | 5 #include "base/file_path.h" |
| 6 #include "base/string_util.h" | 6 #include "base/string_util.h" |
| 7 #include "chrome/app/chrome_dll_resource.h" | 7 #include "chrome/app/chrome_dll_resource.h" |
| 8 #include "chrome/browser/worker_host/worker_service.h" | 8 #include "chrome/browser/worker_host/worker_service.h" |
| 9 #include "chrome/common/chrome_switches.h" | 9 #include "chrome/common/chrome_switches.h" |
| 10 #include "chrome/common/url_constants.h" | 10 #include "chrome/common/url_constants.h" |
| (...skipping 566 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 577 GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), | 577 GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), |
| 578 FilePath(kWorkerClose)); | 578 FilePath(kWorkerClose)); |
| 579 ASSERT_TRUE(tab->NavigateToURL(url)); | 579 ASSERT_TRUE(tab->NavigateToURL(url)); |
| 580 std::string value = WaitUntilCookieNonEmpty(tab.get(), url, | 580 std::string value = WaitUntilCookieNonEmpty(tab.get(), url, |
| 581 kTestCompleteCookie, action_max_timeout_ms()); | 581 kTestCompleteCookie, action_max_timeout_ms()); |
| 582 ASSERT_STREQ(kTestCompleteSuccess, value.c_str()); | 582 ASSERT_STREQ(kTestCompleteSuccess, value.c_str()); |
| 583 ASSERT_TRUE(WaitForProcessCountToBe(1, 0)); | 583 ASSERT_TRUE(WaitForProcessCountToBe(1, 0)); |
| 584 } | 584 } |
| 585 | 585 |
| 586 // http://crbug.com/42641 | 586 // http://crbug.com/42641 |
| 587 TEST_F(WorkerTest, DISABLED_QueuedSharedWorkerShutdown) { | 587 TEST_F(WorkerTest, FAILS_QueuedSharedWorkerShutdown) { |
| 588 // Tests to make sure that queued shared workers are started up when | 588 // Tests to make sure that queued shared workers are started up when |
| 589 // shared workers shut down. | 589 // shared workers shut down. |
| 590 int max_workers_per_tab = WorkerService::kMaxWorkersPerTabWhenSeparate; | 590 int max_workers_per_tab = WorkerService::kMaxWorkersPerTabWhenSeparate; |
| 591 GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), | 591 GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), |
| 592 FilePath(kQuerySharedWorkerShutdownFile)); | 592 FilePath(kQuerySharedWorkerShutdownFile)); |
| 593 url = GURL(url.spec() + StringPrintf("?count=%d", max_workers_per_tab)); | 593 url = GURL(url.spec() + StringPrintf("?count=%d", max_workers_per_tab)); |
| 594 | 594 |
| 595 scoped_refptr<TabProxy> tab(GetActiveTab()); | 595 scoped_refptr<TabProxy> tab(GetActiveTab()); |
| 596 ASSERT_TRUE(tab.get()); | 596 ASSERT_TRUE(tab.get()); |
| 597 ASSERT_TRUE(tab->NavigateToURL(url)); | 597 ASSERT_TRUE(tab->NavigateToURL(url)); |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 667 | 667 |
| 668 std::string value = WaitUntilCookieNonEmpty(tab.get(), url, | 668 std::string value = WaitUntilCookieNonEmpty(tab.get(), url, |
| 669 kTestCompleteCookie, action_max_timeout_ms()); | 669 kTestCompleteCookie, action_max_timeout_ms()); |
| 670 ASSERT_STREQ(kTestCompleteSuccess, value.c_str()); | 670 ASSERT_STREQ(kTestCompleteSuccess, value.c_str()); |
| 671 ASSERT_TRUE(WaitForProcessCountToBe(2, max_workers_per_tab+1)); | 671 ASSERT_TRUE(WaitForProcessCountToBe(2, max_workers_per_tab+1)); |
| 672 } | 672 } |
| 673 | 673 |
| 674 TEST_F(WorkerTest, OpenDatabaseSyncInputs) { | 674 TEST_F(WorkerTest, OpenDatabaseSyncInputs) { |
| 675 RunWorkerStorageLayoutTest("open-database-sync-inputs.html"); | 675 RunWorkerStorageLayoutTest("open-database-sync-inputs.html"); |
| 676 } | 676 } |
| OLD | NEW |