Index: content/browser/service_worker/service_worker_version_unittest.cc |
diff --git a/content/browser/service_worker/service_worker_version_unittest.cc b/content/browser/service_worker/service_worker_version_unittest.cc |
index 08aa0d18b0ab8d95ad4c059a8efb366fd8220bf6..6308a2e4a3184b57d28669c4d8173a58410b5b82 100644 |
--- a/content/browser/service_worker/service_worker_version_unittest.cc |
+++ b/content/browser/service_worker/service_worker_version_unittest.cc |
@@ -1256,15 +1256,15 @@ TEST_F(ServiceWorkerVersionTest, RegisterForeignFetchScopes) { |
// Invalid subscope, should kill worker (but in tests will only increase bad |
// message count). |
- version_->OnRegisterForeignFetchScopes(std::vector<GURL>(1, GURL()), |
- valid_origin_list); |
+ version_->RegisterForeignFetchScopes(std::vector<GURL>(1, GURL()), |
+ valid_origin_list); |
base::RunLoop().RunUntilIdle(); |
EXPECT_EQ(1, helper_->mock_render_process_host()->bad_msg_count()); |
EXPECT_EQ(0u, version_->foreign_fetch_scopes_.size()); |
EXPECT_EQ(0u, version_->foreign_fetch_origins_.size()); |
// Subscope outside the scope of the worker. |
- version_->OnRegisterForeignFetchScopes( |
+ version_->RegisterForeignFetchScopes( |
std::vector<GURL>(1, GURL("http://www.example.com/wrong")), |
valid_origin_list); |
base::RunLoop().RunUntilIdle(); |
@@ -1273,7 +1273,7 @@ TEST_F(ServiceWorkerVersionTest, RegisterForeignFetchScopes) { |
EXPECT_EQ(0u, version_->foreign_fetch_origins_.size()); |
// Subscope on wrong origin. |
- version_->OnRegisterForeignFetchScopes( |
+ version_->RegisterForeignFetchScopes( |
std::vector<GURL>(1, GURL("http://example.com/test/")), |
valid_origin_list); |
base::RunLoop().RunUntilIdle(); |
@@ -1282,7 +1282,7 @@ TEST_F(ServiceWorkerVersionTest, RegisterForeignFetchScopes) { |
EXPECT_EQ(0u, version_->foreign_fetch_origins_.size()); |
// Invalid origin. |
- version_->OnRegisterForeignFetchScopes( |
+ version_->RegisterForeignFetchScopes( |
valid_scopes, std::vector<url::Origin>(1, url::Origin())); |
base::RunLoop().RunUntilIdle(); |
EXPECT_EQ(4, helper_->mock_render_process_host()->bad_msg_count()); |
@@ -1290,8 +1290,8 @@ TEST_F(ServiceWorkerVersionTest, RegisterForeignFetchScopes) { |
EXPECT_EQ(0u, version_->foreign_fetch_origins_.size()); |
// Valid subscope, no origins. |
- version_->OnRegisterForeignFetchScopes(std::vector<GURL>(1, valid_scope_1), |
- all_origins); |
+ version_->RegisterForeignFetchScopes(std::vector<GURL>(1, valid_scope_1), |
+ all_origins); |
base::RunLoop().RunUntilIdle(); |
EXPECT_EQ(4, helper_->mock_render_process_host()->bad_msg_count()); |
EXPECT_EQ(1u, version_->foreign_fetch_scopes_.size()); |
@@ -1299,7 +1299,7 @@ TEST_F(ServiceWorkerVersionTest, RegisterForeignFetchScopes) { |
EXPECT_EQ(0u, version_->foreign_fetch_origins_.size()); |
// Valid subscope, explicit origins. |
- version_->OnRegisterForeignFetchScopes(valid_scopes, valid_origin_list); |
+ version_->RegisterForeignFetchScopes(valid_scopes, valid_origin_list); |
base::RunLoop().RunUntilIdle(); |
EXPECT_EQ(4, helper_->mock_render_process_host()->bad_msg_count()); |
EXPECT_EQ(2u, version_->foreign_fetch_scopes_.size()); |