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

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

Issue 2623733002: Componentize SafeBrowsingBlockingPage for WebView use (Closed)
Patch Set: address final comments 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
« no previous file with comments | « chrome/browser/safe_browsing/ui_manager.cc ('k') | components/safe_browsing/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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(
342 web_contents, 342 manager,
343 main_frame_url, 343 web_contents,
344 unsafe_resources) { 344 main_frame_url,
345 unsafe_resources,
346 BaseBlockingPage::CreateDefaultDisplayOptions(unsafe_resources)) {
345 // Don't delay details at all for the unittest. 347 // Don't delay details at all for the unittest.
346 threat_details_proceed_delay_ms_ = 0; 348 threat_details_proceed_delay_ms_ = 0;
347 DontCreateViewForTesting(); 349 DontCreateViewForTesting();
348 } 350 }
349 }; 351 };
350 352
351 // A factory that creates TestSafeBrowsingBlockingPages. 353 // A factory that creates TestSafeBrowsingBlockingPages.
352 class TestSafeBrowsingBlockingPageFactory 354 class TestSafeBrowsingBlockingPageFactory
353 : public SafeBrowsingBlockingPageFactory { 355 : public SafeBrowsingBlockingPageFactory {
354 public: 356 public:
355 TestSafeBrowsingBlockingPageFactory() {} 357 TestSafeBrowsingBlockingPageFactory() {}
356 ~TestSafeBrowsingBlockingPageFactory() override {} 358 ~TestSafeBrowsingBlockingPageFactory() override {}
357 359
358 SafeBrowsingBlockingPage* CreateSafeBrowsingPage( 360 SafeBrowsingBlockingPage* CreateSafeBrowsingPage(
359 SafeBrowsingUIManager* delegate, 361 BaseUIManager* delegate,
360 content::WebContents* web_contents, 362 content::WebContents* web_contents,
361 const GURL& main_frame_url, 363 const GURL& main_frame_url,
362 const SafeBrowsingBlockingPage::UnsafeResourceList& unsafe_resources) 364 const SafeBrowsingBlockingPage::UnsafeResourceList& unsafe_resources)
363 override { 365 override {
364 return new TestSafeBrowsingBlockingPage(delegate, web_contents, 366 return new TestSafeBrowsingBlockingPage(delegate, web_contents,
365 main_frame_url, unsafe_resources); 367 main_frame_url, unsafe_resources);
366 } 368 }
367 }; 369 };
368 370
369 } // namespace 371 } // namespace
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
404 SimulateBlockingPageDone(resources, true); 406 SimulateBlockingPageDone(resources, true);
405 EXPECT_TRUE(delegate.visible_security_state_changed()); 407 EXPECT_TRUE(delegate.visible_security_state_changed());
406 408
407 waiter.WaitForCallback(); 409 waiter.WaitForCallback();
408 EXPECT_TRUE(waiter.callback_called()); 410 EXPECT_TRUE(waiter.callback_called());
409 EXPECT_TRUE(waiter.proceed()); 411 EXPECT_TRUE(waiter.proceed());
410 EXPECT_TRUE(IsWhitelisted(resource)); 412 EXPECT_TRUE(IsWhitelisted(resource));
411 } 413 }
412 414
413 } // namespace safe_browsing 415 } // namespace safe_browsing
OLDNEW
« no previous file with comments | « chrome/browser/safe_browsing/ui_manager.cc ('k') | components/safe_browsing/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698