OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "chrome/browser/safe_browsing/ui_manager.h" | 5 #include "chrome/browser/safe_browsing/ui_manager.h" |
6 | 6 |
7 #include "base/run_loop.h" | 7 #include "base/run_loop.h" |
8 #include "chrome/browser/safe_browsing/safe_browsing_service.h" | 8 #include "chrome/browser/safe_browsing/safe_browsing_service.h" |
9 #include "chrome/test/base/chrome_render_view_host_test_harness.h" | 9 #include "chrome/test/base/chrome_render_view_host_test_harness.h" |
10 #include "chrome/test/base/testing_profile.h" | 10 #include "chrome/test/base/testing_profile.h" |
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
198 } | 198 } |
199 | 199 |
200 TEST_F(SafeBrowsingUIManagerTest, UICallbackProceed) { | 200 TEST_F(SafeBrowsingUIManagerTest, UICallbackProceed) { |
201 SafeBrowsingUIManager::UnsafeResource resource = | 201 SafeBrowsingUIManager::UnsafeResource resource = |
202 MakeUnsafeResourceAndStartNavigation(kBadURL); | 202 MakeUnsafeResourceAndStartNavigation(kBadURL); |
203 SafeBrowsingCallbackWaiter waiter; | 203 SafeBrowsingCallbackWaiter waiter; |
204 resource.callback = | 204 resource.callback = |
205 base::Bind(&SafeBrowsingCallbackWaiter::OnBlockingPageDone, | 205 base::Bind(&SafeBrowsingCallbackWaiter::OnBlockingPageDone, |
206 base::Unretained(&waiter)); | 206 base::Unretained(&waiter)); |
207 resource.callback_thread = | 207 resource.callback_thread = |
208 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI); | 208 BrowserThread::GetTaskRunnerForThread(BrowserThread::UI); |
209 std::vector<SafeBrowsingUIManager::UnsafeResource> resources; | 209 std::vector<SafeBrowsingUIManager::UnsafeResource> resources; |
210 resources.push_back(resource); | 210 resources.push_back(resource); |
211 SimulateBlockingPageDone(resources, true); | 211 SimulateBlockingPageDone(resources, true); |
212 EXPECT_TRUE(IsWhitelisted(resource)); | 212 EXPECT_TRUE(IsWhitelisted(resource)); |
213 waiter.WaitForCallback(); | 213 waiter.WaitForCallback(); |
214 EXPECT_TRUE(waiter.callback_called()); | 214 EXPECT_TRUE(waiter.callback_called()); |
215 EXPECT_TRUE(waiter.proceed()); | 215 EXPECT_TRUE(waiter.proceed()); |
216 } | 216 } |
217 | 217 |
218 TEST_F(SafeBrowsingUIManagerTest, UICallbackDontProceed) { | 218 TEST_F(SafeBrowsingUIManagerTest, UICallbackDontProceed) { |
219 SafeBrowsingUIManager::UnsafeResource resource = | 219 SafeBrowsingUIManager::UnsafeResource resource = |
220 MakeUnsafeResourceAndStartNavigation(kBadURL); | 220 MakeUnsafeResourceAndStartNavigation(kBadURL); |
221 SafeBrowsingCallbackWaiter waiter; | 221 SafeBrowsingCallbackWaiter waiter; |
222 resource.callback = | 222 resource.callback = |
223 base::Bind(&SafeBrowsingCallbackWaiter::OnBlockingPageDone, | 223 base::Bind(&SafeBrowsingCallbackWaiter::OnBlockingPageDone, |
224 base::Unretained(&waiter)); | 224 base::Unretained(&waiter)); |
225 resource.callback_thread = | 225 resource.callback_thread = |
226 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI); | 226 BrowserThread::GetTaskRunnerForThread(BrowserThread::UI); |
227 std::vector<SafeBrowsingUIManager::UnsafeResource> resources; | 227 std::vector<SafeBrowsingUIManager::UnsafeResource> resources; |
228 resources.push_back(resource); | 228 resources.push_back(resource); |
229 SimulateBlockingPageDone(resources, false); | 229 SimulateBlockingPageDone(resources, false); |
230 EXPECT_FALSE(IsWhitelisted(resource)); | 230 EXPECT_FALSE(IsWhitelisted(resource)); |
231 waiter.WaitForCallback(); | 231 waiter.WaitForCallback(); |
232 EXPECT_TRUE(waiter.callback_called()); | 232 EXPECT_TRUE(waiter.callback_called()); |
233 EXPECT_FALSE(waiter.proceed()); | 233 EXPECT_FALSE(waiter.proceed()); |
234 } | 234 } |
235 | 235 |
236 TEST_F(SafeBrowsingUIManagerTest, IOCallbackProceed) { | 236 TEST_F(SafeBrowsingUIManagerTest, IOCallbackProceed) { |
237 SafeBrowsingUIManager::UnsafeResource resource = | 237 SafeBrowsingUIManager::UnsafeResource resource = |
238 MakeUnsafeResourceAndStartNavigation(kBadURL); | 238 MakeUnsafeResourceAndStartNavigation(kBadURL); |
239 SafeBrowsingCallbackWaiter waiter; | 239 SafeBrowsingCallbackWaiter waiter; |
240 resource.callback = | 240 resource.callback = |
241 base::Bind(&SafeBrowsingCallbackWaiter::OnBlockingPageDoneOnIO, | 241 base::Bind(&SafeBrowsingCallbackWaiter::OnBlockingPageDoneOnIO, |
242 base::Unretained(&waiter)); | 242 base::Unretained(&waiter)); |
243 resource.callback_thread = | 243 resource.callback_thread = |
244 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO); | 244 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO); |
245 std::vector<SafeBrowsingUIManager::UnsafeResource> resources; | 245 std::vector<SafeBrowsingUIManager::UnsafeResource> resources; |
246 resources.push_back(resource); | 246 resources.push_back(resource); |
247 SimulateBlockingPageDone(resources, true); | 247 SimulateBlockingPageDone(resources, true); |
248 EXPECT_TRUE(IsWhitelisted(resource)); | 248 EXPECT_TRUE(IsWhitelisted(resource)); |
249 waiter.WaitForCallback(); | 249 waiter.WaitForCallback(); |
250 EXPECT_TRUE(waiter.callback_called()); | 250 EXPECT_TRUE(waiter.callback_called()); |
251 EXPECT_TRUE(waiter.proceed()); | 251 EXPECT_TRUE(waiter.proceed()); |
252 } | 252 } |
253 | 253 |
254 TEST_F(SafeBrowsingUIManagerTest, IOCallbackDontProceed) { | 254 TEST_F(SafeBrowsingUIManagerTest, IOCallbackDontProceed) { |
255 SafeBrowsingUIManager::UnsafeResource resource = | 255 SafeBrowsingUIManager::UnsafeResource resource = |
256 MakeUnsafeResourceAndStartNavigation(kBadURL); | 256 MakeUnsafeResourceAndStartNavigation(kBadURL); |
257 SafeBrowsingCallbackWaiter waiter; | 257 SafeBrowsingCallbackWaiter waiter; |
258 resource.callback = | 258 resource.callback = |
259 base::Bind(&SafeBrowsingCallbackWaiter::OnBlockingPageDoneOnIO, | 259 base::Bind(&SafeBrowsingCallbackWaiter::OnBlockingPageDoneOnIO, |
260 base::Unretained(&waiter)); | 260 base::Unretained(&waiter)); |
261 resource.callback_thread = | 261 resource.callback_thread = |
262 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO); | 262 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO); |
263 std::vector<SafeBrowsingUIManager::UnsafeResource> resources; | 263 std::vector<SafeBrowsingUIManager::UnsafeResource> resources; |
264 resources.push_back(resource); | 264 resources.push_back(resource); |
265 SimulateBlockingPageDone(resources, false); | 265 SimulateBlockingPageDone(resources, false); |
266 EXPECT_FALSE(IsWhitelisted(resource)); | 266 EXPECT_FALSE(IsWhitelisted(resource)); |
267 waiter.WaitForCallback(); | 267 waiter.WaitForCallback(); |
268 EXPECT_TRUE(waiter.callback_called()); | 268 EXPECT_TRUE(waiter.callback_called()); |
269 EXPECT_FALSE(waiter.proceed()); | 269 EXPECT_FALSE(waiter.proceed()); |
270 } | 270 } |
271 | 271 |
272 } // namespace safe_browsing | 272 } // namespace safe_browsing |
OLD | NEW |