OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/callback.h" | 6 #include "base/callback.h" |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/run_loop.h" | 8 #include "base/run_loop.h" |
9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
10 #include "content/browser/fileapi/chrome_blob_storage_context.h" | 10 #include "content/browser/fileapi/chrome_blob_storage_context.h" |
(...skipping 479 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
490 IN_PROC_BROWSER_TEST_F(EmbeddedWorkerBrowserTest, StartPaused_ThenResume) { | 490 IN_PROC_BROWSER_TEST_F(EmbeddedWorkerBrowserTest, StartPaused_ThenResume) { |
491 pause_mode_ = PAUSE_THEN_RESUME; | 491 pause_mode_ = PAUSE_THEN_RESUME; |
492 base::RunLoop start_run_loop; | 492 base::RunLoop start_run_loop; |
493 done_closure_ = start_run_loop.QuitClosure(); | 493 done_closure_ = start_run_loop.QuitClosure(); |
494 BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, | 494 BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, |
495 base::Bind(&self::StartOnIOThread, this)); | 495 base::Bind(&self::StartOnIOThread, this)); |
496 start_run_loop.Run(); | 496 start_run_loop.Run(); |
497 ASSERT_EQ(EmbeddedWorkerInstance::RUNNING, last_worker_status_); | 497 ASSERT_EQ(EmbeddedWorkerInstance::RUNNING, last_worker_status_); |
498 } | 498 } |
499 | 499 |
500 // TODO(michaeln): Enable after the blink side is fixed. | |
501 IN_PROC_BROWSER_TEST_F(EmbeddedWorkerBrowserTest, | 500 IN_PROC_BROWSER_TEST_F(EmbeddedWorkerBrowserTest, |
502 DISABLED_StartPaused_ThenStop) { | 501 StartPaused_ThenStop) { |
503 pause_mode_ = PAUSE_THEN_STOP; | 502 pause_mode_ = PAUSE_THEN_STOP; |
504 base::RunLoop start_run_loop; | 503 base::RunLoop start_run_loop; |
505 done_closure_ = start_run_loop.QuitClosure(); | 504 done_closure_ = start_run_loop.QuitClosure(); |
506 BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, | 505 BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, |
507 base::Bind(&self::StartOnIOThread, this)); | 506 base::Bind(&self::StartOnIOThread, this)); |
508 start_run_loop.Run(); | 507 start_run_loop.Run(); |
509 ASSERT_EQ(EmbeddedWorkerInstance::STOPPED, last_worker_status_); | 508 ASSERT_EQ(EmbeddedWorkerInstance::STOPPED, last_worker_status_); |
510 } | 509 } |
511 | 510 |
512 IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest, StartAndStop) { | 511 IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest, StartAndStop) { |
(...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
796 base::Bind(&ServiceWorkerBlackBoxBrowserTest::FindRegistrationOnIO, | 795 base::Bind(&ServiceWorkerBlackBoxBrowserTest::FindRegistrationOnIO, |
797 this, | 796 this, |
798 embedded_test_server()->GetURL("/service_worker/empty.html"), | 797 embedded_test_server()->GetURL("/service_worker/empty.html"), |
799 &status, | 798 &status, |
800 &script_url)); | 799 &script_url)); |
801 EXPECT_EQ(SERVICE_WORKER_ERROR_NOT_FOUND, status); | 800 EXPECT_EQ(SERVICE_WORKER_ERROR_NOT_FOUND, status); |
802 } | 801 } |
803 } | 802 } |
804 | 803 |
805 } // namespace content | 804 } // namespace content |
OLD | NEW |