Remove Dangerous indicator after going back from interstitial

chrome/browser/safe_browsing/ui_manager_unittest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/safe_browsing/ui_manager.h"
 
 #include "base/run_loop.h"
 #include "chrome/browser/safe_browsing/safe_browsing_blocking_page.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/browser/safe_browsing/ui_manager.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/safe_browsing_db/safe_browsing_prefs.h"
 #include "components/safe_browsing_db/util.h"
+#include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "content/public/test/web_contents_tester.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
 using content::BrowserThread;
@@ skipping 41 matching lines @@
 
 class SafeBrowsingUIManagerTest : public ChromeRenderViewHostTestHarness {
  public:
   SafeBrowsingUIManagerTest() : ui_manager_(new SafeBrowsingUIManager(NULL)) {}
 
   ~SafeBrowsingUIManagerTest() override{};
 
   void SetUp() override {
     SetThreadBundleOptions(content::TestBrowserThreadBundle::REAL_IO_THREAD);
     ChromeRenderViewHostTestHarness::SetUp();
+    SafeBrowsingUIManager::CreateWhitelistForTesting(web_contents());
   }
 
   void TearDown() override { ChromeRenderViewHostTestHarness::TearDown(); }
 
   bool IsWhitelisted(SafeBrowsingUIManager::UnsafeResource resource) {
     return ui_manager_->IsWhitelisted(resource);
   }
 
   void AddToWhitelist(SafeBrowsingUIManager::UnsafeResource resource) {
-    ui_manager_->AddToWhitelistUrlSet(resource, false);
+    ui_manager_->AddToWhitelistUrlSet(
+        SafeBrowsingUIManager::GetMainFrameWhitelistUrlForResourceForTesting(
+            resource),
+        web_contents(), false);
   }
 
   SafeBrowsingUIManager::UnsafeResource MakeUnsafeResource(
       const char* url,
       bool is_subresource) {
     SafeBrowsingUIManager::UnsafeResource resource;
     resource.url = GURL(url);
     resource.is_subresource = is_subresource;
     resource.web_contents_getter =
         SafeBrowsingUIManager::UnsafeResource::GetWebContentsGetter(
@@ skipping 10 matching lines @@
 
     // The WC doesn't have a URL without a navigation. A main-frame malware
     // unsafe resource must be a pending navigation.
     content::WebContentsTester::For(web_contents())->StartNavigation(GURL(url));
     return resource;
   }
 
   void SimulateBlockingPageDone(
       const std::vector<SafeBrowsingUIManager::UnsafeResource>& resources,
       bool proceed) {
-    ui_manager_->OnBlockingPageDone(resources, proceed);
+    GURL main_frame_url;
+    content::NavigationEntry* entry =
+        web_contents()->GetController().GetVisibleEntry();
+    if (entry)
+      main_frame_url = entry->GetURL();
+
+    ui_manager_->OnBlockingPageDone(resources, proceed, web_contents(),
+                                    main_frame_url);
   }
 
  protected:
   SafeBrowsingUIManager* ui_manager() { return ui_manager_.get(); }
 
  private:
   scoped_refptr<SafeBrowsingUIManager> ui_manager_;
 };
 
 TEST_F(SafeBrowsingUIManagerTest, Whitelist) {
@@ skipping 250 matching lines @@
   SimulateBlockingPageDone(resources, true);
   EXPECT_TRUE(delegate.visible_security_state_changed());
 
   waiter.WaitForCallback();
   EXPECT_TRUE(waiter.callback_called());
   EXPECT_TRUE(waiter.proceed());
   EXPECT_TRUE(IsWhitelisted(resource));
 }
 
 }  // namespace safe_browsing