DidNavigate refactor of doom

chrome/browser/safe_browsing/safe_browsing_blocking_page.cc

 // Copyright (c) 2006-2008 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.
 //
 // Implementation of the SafeBrowsingBlockingPage class.
 
 #include "chrome/browser/safe_browsing/safe_browsing_blocking_page.h"
 
 #include "chrome/app/locales/locale_settings.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 152 matching lines @@
   }
 
   std::string html_page(jstemplate_builder::GetTemplateHtml(html,
                                                             &strings,
                                                             "template_root"));
 
   // If the malware is the actual main frame and we have no pending entry
   // (typically the navigation was initiated by the page), we create a fake
   // navigation entry (so the location bar shows the page's URL).
   if (is_main_frame_ && tab_->controller()->GetPendingEntryIndex() == -1) {
-    // New navigation.
-    NavigationEntry* nav_entry = new NavigationEntry(TAB_CONTENTS_WEB);
-
-    // We set the page ID to max page id so to ensure the controller considers
-    // this dummy entry a new one.  Because we'll remove the entry when the
-    // interstitial is going away, it will not conflict with any future
-    // navigations.
-    nav_entry->set_page_id(tab_->GetMaxPageID() + 1);
-    nav_entry->set_page_type(NavigationEntry::INTERSTITIAL_PAGE);
-    nav_entry->set_url(url_);
-
-    // The default details is "new navigation", and that's OK with us.
-    NavigationController::LoadCommittedDetails details;
-    tab_->controller()->DidNavigateToEntry(nav_entry, &details);
+    NavigationEntry new_entry(TAB_CONTENTS_WEB);
+    new_entry.set_url(url_);
+    new_entry.set_page_type(NavigationEntry::INTERSTITIAL_PAGE);
+    tab_->controller()->AddDummyEntryForInterstitial(new_entry);
     created_temporary_entry_ = true;
   }
 
   // Show the interstitial page.
   web_contents->ShowInterstitialPage(html_page, this);
 }
 
 void SafeBrowsingBlockingPage::Observe(NotificationType type,
                                        const NotificationSource& source,
                                        const NotificationDetails& details) {
@@ skipping 41 matching lines @@
     // and show the page the user was on before.
     web_contents->HideInterstitialPage(false, false);
   }
 
   // WARNING: at this point we are now either deleted or pending deletion from
   //          the IO thread.
 
   // Remove the navigation entry for the malware page.  Note that we always
   // remove the entry even if we did not create it as it has been flagged as
   // malware and we don't want the user navigating back to it.
-  web_contents->controller()->RemoveLastEntry();
+  web_contents->controller()->RemoveLastEntryForInterstitial();
 
   return true;
 }
 
 void SafeBrowsingBlockingPage::Continue(const std::string& user_action) {
   TabContents* tab = tab_util::GetTabContentsByID(render_process_host_id_,
                                                   render_view_id_);
   DCHECK(tab);
   WebContents* web = tab->AsWebContents();
   if (user_action == "2") {
@@ skipping 31 matching lines @@
     web->OpenURL(diagnostic_url, CURRENT_TAB, PageTransition::LINK);
     return;
   }
 
   proceed_ = user_action == "1";
 
   if (proceed_) {
     // We are continuing, if we have created a temporary navigation entry,
     // delete it as a new will be created on navigation.
     if (created_temporary_entry_)
-      web->controller()->RemoveLastEntry();
+      web->controller()->RemoveLastEntryForInterstitial();
     if (is_main_frame_)
       web->HideInterstitialPage(true, true);
     else
       web->HideInterstitialPage(false, false);
   } else {
     GoBack();
   }
 
   NotifyDone();
 }
@@ skipping 24 matching lines @@
   base::Thread* io_thread = g_browser_process->io_thread();
   if (!io_thread)
     return;
 
   io_thread->message_loop()->PostTask(FROM_HERE, NewRunnableMethod(
       sb_service_,
       &SafeBrowsingService::OnBlockingPageDone,
       this, client_, proceed_));
 }