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

chrome/browser/prerender/prerender_contents.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/prerender/prerender_contents.h"
 
 #include <algorithm>
 #include <functional>
 #include <utility>
 
@@ skipping 86 matching lines @@
     // that requires the browser to perform the transition instead of WebKit.
     // Examples include prerendering a site that redirects to an app URL,
     // or if --enable-strict-site-isolation is specified and the prerendered
     // frame redirects to a different origin.
     // TODO(cbentzel): Consider supporting this if it is a common case during
     // prerenders.
     prerender_contents_->Destroy(FINAL_STATUS_OPEN_URL);
     return NULL;
   }
 
-  virtual bool ShouldAddNavigationToHistory(
-      const history::HistoryAddPageArgs& add_page_args,
-      content::NavigationType navigation_type) OVERRIDE {
-    add_page_vector_.push_back(add_page_args);
-    return false;
-  }
-
   virtual bool CanDownload(RenderViewHost* render_view_host,
                            int request_id,
                            const std::string& request_method) OVERRIDE {
     prerender_contents_->Destroy(FINAL_STATUS_DOWNLOAD);
     // Cancel the download.
     return false;
   }
 
   virtual void OnStartDownload(WebContents* source,
                                DownloadItem* download) OVERRIDE {
@@ skipping 39 matching lines @@
   virtual void RegisterProtocolHandler(WebContents* web_contents,
                                        const std::string& protocol,
                                        const GURL& url,
                                        const string16& title,
                                        bool user_gesture) OVERRIDE {
     // TODO(mmenke): Consider supporting this if it is a common case during
     // prerenders.
     prerender_contents_->Destroy(FINAL_STATUS_REGISTER_PROTOCOL_HANDLER);
   }
 
-  // Commits the History of Pages to the given TabContents.
-  void CommitHistory(TabContents* tab) {
-    for (size_t i = 0; i < add_page_vector_.size(); ++i)
-      tab->history_tab_helper()->UpdateHistoryForNavigation(
-          add_page_vector_[i]);
-  }
-
  private:
-  typedef std::vector<history::HistoryAddPageArgs> AddPageVector;
-
-  // Caches pages to be added to the history.
-  AddPageVector add_page_vector_;
-
   PrerenderContents* prerender_contents_;
 };
 
 void PrerenderContents::AddPendingPrerender(
     const base::WeakPtr<PrerenderHandle> weak_prerender_handle,
     const GURL& url,
     const content::Referrer& referrer,
     const gfx::Size& size) {
   pending_prerenders_.push_back(
       PendingPrerenderInfo(weak_prerender_handle, url, referrer, size));
@@ skipping 494 matching lines @@
 RenderViewHost* PrerenderContents::GetRenderViewHostMutable() {
   return const_cast<RenderViewHost*>(GetRenderViewHost());
 }
 
 const RenderViewHost* PrerenderContents::GetRenderViewHost() const {
   if (!prerender_contents_.get())
     return NULL;
   return prerender_contents_->web_contents()->GetRenderViewHost();
 }
 
+void PrerenderContents::DidNavigate(
+    const history::HistoryAddPageArgs& add_page_args) {
+  add_page_vector_.push_back(add_page_args);
+}
+
 void PrerenderContents::CommitHistory(TabContents* tab) {
-  if (tab_contents_delegate_.get())
-    tab_contents_delegate_->CommitHistory(tab);
+  for (size_t i = 0; i < add_page_vector_.size(); ++i)
+    prerender_contents_->history_tab_helper()->UpdateHistoryForNavigation(
+        add_page_vector_[i]);
 }
 
 Value* PrerenderContents::GetAsValue() const {
   if (!prerender_contents_.get())
     return NULL;
   DictionaryValue* dict_value = new DictionaryValue();
   dict_value->SetString("url", prerender_url_.spec());
   base::TimeTicks current_time = base::TimeTicks::Now();
   base::TimeDelta duration = current_time - load_start_time_;
   dict_value->SetInteger("duration", duration.InSeconds());
   return dict_value;
 }
 
 bool PrerenderContents::IsCrossSiteNavigationPending() const {
   if (!prerender_contents_.get() || !prerender_contents_->web_contents())
     return false;
   const WebContents* web_contents = prerender_contents_->web_contents();
   return (web_contents->GetSiteInstance() !=
           web_contents->GetPendingSiteInstance());
 }
 
 
 }  // namespace prerender