| Index: chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
|
| diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
|
| index 5875cb377e678d39fd49a2bf552b971cc9147f5c..ea506d16e2c2d1f889b3b5efbffc540ece1353fb 100644
|
| --- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
|
| +++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
|
| @@ -873,6 +873,20 @@ SafeBrowsingBlockingPage::UnsafeResourceMap*
|
| }
|
|
|
| // static
|
| +SafeBrowsingBlockingPage* SafeBrowsingBlockingPage::CreateBlockingPage(
|
| + SafeBrowsingUIManager* ui_manager,
|
| + WebContents* web_contents,
|
| + const UnsafeResource& unsafe_resource) {
|
| + std::vector<UnsafeResource> resources;
|
| + resources.push_back(unsafe_resource);
|
| + // Set up the factory if this has not been done already (tests do that
|
| + // before this method is called).
|
| + if (!factory_)
|
| + factory_ = g_safe_browsing_blocking_page_factory_impl.Pointer();
|
| + return factory_->CreateSafeBrowsingPage(ui_manager, web_contents, resources);
|
| +}
|
| +
|
| +// static
|
| void SafeBrowsingBlockingPage::ShowBlockingPage(
|
| SafeBrowsingUIManager* ui_manager,
|
| const UnsafeResource& unsafe_resource) {
|
| @@ -893,14 +907,8 @@ void SafeBrowsingBlockingPage::ShowBlockingPage(
|
| if (!interstitial) {
|
| // There are no interstitial currently showing in that tab, go ahead and
|
| // show this interstitial.
|
| - std::vector<UnsafeResource> resources;
|
| - resources.push_back(unsafe_resource);
|
| - // Set up the factory if this has not been done already (tests do that
|
| - // before this method is called).
|
| - if (!factory_)
|
| - factory_ = g_safe_browsing_blocking_page_factory_impl.Pointer();
|
| SafeBrowsingBlockingPage* blocking_page =
|
| - factory_->CreateSafeBrowsingPage(ui_manager, web_contents, resources);
|
| + CreateBlockingPage(ui_manager, web_contents, unsafe_resource);
|
| blocking_page->interstitial_page_->Show();
|
| return;
|
| }
|
|
|