Remove two functions on WebContentsDelegate which didn't belong in content. They were only called f…

chrome/browser/history/history_tab_helper.cc

 // Copyright (c) 2012 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/history/history_tab_helper.h"
 
 #include <utility>
 
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/history/top_sites.h"
+#include "chrome/browser/prerender/prerender_manager.h"
+#include "chrome/browser/prerender/prerender_manager_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/render_messages.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/common/frame_navigate_params.h"
 
+#if !defined(OS_ANDROID)
+#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_finder.h"
+#endif
+
 using content::NavigationEntry;
 using content::WebContents;
 
 HistoryTabHelper::HistoryTabHelper(WebContents* web_contents)
     : content::WebContentsObserver(web_contents),
       received_page_title_(false) {
   registrar_.Add(this, content::NOTIFICATION_WEB_CONTENTS_TITLE_UPDATED,
                  content::Source<WebContents>(web_contents));
 }
 
@@ skipping 65 matching lines @@
   // which WillNavigate[Main,Sub]Frame will do before this function is called.
   if (!params.should_update_history)
     return;
 
   // Most of the time, the displayURL matches the loaded URL, but for about:
   // URLs, we use a data: URL as the real value.  We actually want to save the
   // about: URL to the history db and keep the data: URL hidden. This is what
   // the WebContents' URL getter does.
   const history::HistoryAddPageArgs& add_page_args =
       CreateHistoryAddPageArgs(web_contents()->GetURL(), details, params);
-  if (!web_contents()->GetDelegate() ||
-      !web_contents()->GetDelegate()->ShouldAddNavigationToHistory(
-          add_page_args, details.type))
+
+#if !defined(OS_ANDROID)
+  // Don't update history if this web contents isn't associatd with a tab (i.e.
+  // instant or prerender) or is used for running an app.
+  Browser* browser = browser::FindBrowserWithWebContents(web_contents());
+  if (!browser || browser->is_app())
     return;
+#else
+  // The above check is more thorough, but since we don't have Browser* on
+  // Android, at least check prerendering.
+  prerender::PrerenderManager* prerender_manager =
+      prerender::PrerenderManagerFactory::GetForProfile(
+          Profile::FromBrowserContext(web_contents()->GetBrowserContext()));
+  if (prerender_manager &&
+      prerender_manager->IsWebContentsPrerendering(web_contents())) {
+    return;
+  }
+#endif
 
   UpdateHistoryForNavigation(add_page_args);
 }
 
 void HistoryTabHelper::Observe(int type,
                                const content::NotificationSource& source,
                                const content::NotificationDetails& details) {
   DCHECK(type == content::NOTIFICATION_WEB_CONTENTS_TITLE_UPDATED);
   std::pair<content::NavigationEntry*, bool>* title =
       content::Details<std::pair<content::NavigationEntry*, bool> >(
@@ skipping 65 matching lines @@
   HistoryService* hs =
       HistoryServiceFactory::GetForProfile(profile, Profile::IMPLICIT_ACCESS);
   if (hs) {
     NavigationEntry* entry = tab->GetController().GetLastCommittedEntry();
     if (entry) {
       hs->UpdateWithPageEndTime(tab, entry->GetPageID(), tab->GetURL(),
                                 base::Time::Now());
     }
   }
 }