Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(88)

Side by Side Diff: chrome/browser/safe_browsing/ui_manager_unittest.cc

Issue 2623733002: Componentize SafeBrowsingBlockingPage for WebView use (Closed)
Patch Set: rebase again + nits Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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_blocking_page.h" 8 #include "chrome/browser/safe_browsing/safe_browsing_blocking_page.h"
9 #include "chrome/browser/safe_browsing/safe_browsing_service.h" 9 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
10 #include "chrome/browser/safe_browsing/ui_manager.h" 10 #include "chrome/browser/safe_browsing/ui_manager.h"
(...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after
327 } 327 }
328 328
329 private: 329 private:
330 bool visible_security_state_changed_ = false; 330 bool visible_security_state_changed_ = false;
331 DISALLOW_COPY_AND_ASSIGN(SecurityStateWebContentsDelegate); 331 DISALLOW_COPY_AND_ASSIGN(SecurityStateWebContentsDelegate);
332 }; 332 };
333 333
334 // A test blocking page that does not create windows. 334 // A test blocking page that does not create windows.
335 class TestSafeBrowsingBlockingPage : public SafeBrowsingBlockingPage { 335 class TestSafeBrowsingBlockingPage : public SafeBrowsingBlockingPage {
336 public: 336 public:
337 TestSafeBrowsingBlockingPage(SafeBrowsingUIManager* manager, 337 TestSafeBrowsingBlockingPage(BaseUIManager* manager,
338 content::WebContents* web_contents, 338 content::WebContents* web_contents,
339 const GURL& main_frame_url, 339 const GURL& main_frame_url,
340 const UnsafeResourceList& unsafe_resources) 340 const UnsafeResourceList& unsafe_resources)
341 : SafeBrowsingBlockingPage(manager, 341 : SafeBrowsingBlockingPage(manager,
342 web_contents, 342 web_contents,
343 main_frame_url, 343 main_frame_url,
344 unsafe_resources) { 344 unsafe_resources,
345 nullptr) {
345 // Don't delay details at all for the unittest. 346 // Don't delay details at all for the unittest.
346 threat_details_proceed_delay_ms_ = 0; 347 threat_details_proceed_delay_ms_ = 0;
347 DontCreateViewForTesting(); 348 DontCreateViewForTesting();
348 } 349 }
349 }; 350 };
350 351
351 // A factory that creates TestSafeBrowsingBlockingPages. 352 // A factory that creates TestSafeBrowsingBlockingPages.
352 class TestSafeBrowsingBlockingPageFactory 353 class TestSafeBrowsingBlockingPageFactory
353 : public SafeBrowsingBlockingPageFactory { 354 : public SafeBrowsingBlockingPageFactory {
354 public: 355 public:
355 TestSafeBrowsingBlockingPageFactory() {} 356 TestSafeBrowsingBlockingPageFactory() {}
356 ~TestSafeBrowsingBlockingPageFactory() override {} 357 ~TestSafeBrowsingBlockingPageFactory() override {}
357 358
358 SafeBrowsingBlockingPage* CreateSafeBrowsingPage( 359 SafeBrowsingBlockingPage* CreateSafeBrowsingPage(
359 SafeBrowsingUIManager* delegate, 360 BaseUIManager* delegate,
360 content::WebContents* web_contents, 361 content::WebContents* web_contents,
361 const GURL& main_frame_url, 362 const GURL& main_frame_url,
362 const SafeBrowsingBlockingPage::UnsafeResourceList& unsafe_resources) 363 const SafeBrowsingBlockingPage::UnsafeResourceList& unsafe_resources)
363 override { 364 override {
364 return new TestSafeBrowsingBlockingPage(delegate, web_contents, 365 return new TestSafeBrowsingBlockingPage(delegate, web_contents,
365 main_frame_url, unsafe_resources); 366 main_frame_url, unsafe_resources);
366 } 367 }
367 }; 368 };
368 369
369 } // namespace 370 } // namespace
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
404 SimulateBlockingPageDone(resources, true); 405 SimulateBlockingPageDone(resources, true);
405 EXPECT_TRUE(delegate.visible_security_state_changed()); 406 EXPECT_TRUE(delegate.visible_security_state_changed());
406 407
407 waiter.WaitForCallback(); 408 waiter.WaitForCallback();
408 EXPECT_TRUE(waiter.callback_called()); 409 EXPECT_TRUE(waiter.callback_called());
409 EXPECT_TRUE(waiter.proceed()); 410 EXPECT_TRUE(waiter.proceed());
410 EXPECT_TRUE(IsWhitelisted(resource)); 411 EXPECT_TRUE(IsWhitelisted(resource));
411 } 412 }
412 413
413 } // namespace safe_browsing 414 } // namespace safe_browsing
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698