Remove history dependency from content.

chrome/browser/instant/instant_loader.cc

 // Copyright (c) 2011 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/instant/instant_loader.h"
 
 #include <algorithm>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/i18n/case_conversion.h"
 #include "base/string_number_conversions.h"
 #include "base/timer.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/favicon/favicon_service.h"
 #include "chrome/browser/history/history_marshaling.h"
+#include "chrome/browser/history/history_tab_helper.h"
 #include "chrome/browser/instant/instant_loader_delegate.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h"
 #include "chrome/browser/ui/download/download_tab_helper.h"
 #include "chrome/browser/ui/download/download_tab_helper_delegate.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/render_messages.h"
 #include "content/browser/renderer_host/render_view_host.h"
@@ skipping 276 matching lines @@
   args->redirects.clear();
   args->redirects.push_back(url);
 
   // Prune all but the first entry.
   add_page_vector_.erase(add_page_vector_.begin() + 1,
                          add_page_vector_.end());
 }
 
 void InstantLoader::TabContentsDelegateImpl::CommitHistory(
     bool supports_instant) {
-  TabContents* tab = loader_->preview_contents()->tab_contents();
+  TabContentsWrapper* tab = loader_->preview_contents();
   if (tab->profile()->IsOffTheRecord())
     return;
 
-  for (size_t i = 0; i < add_page_vector_.size(); ++i)
-    tab->UpdateHistoryForNavigation(add_page_vector_[i].get());
+  for (size_t i = 0; i < add_page_vector_.size(); ++i) {
+    tab->history_tab_helper()->UpdateHistoryForNavigation(
+      add_page_vector_[i].get());
+  }
 
-  NavigationEntry* active_entry = tab->controller().GetActiveEntry();
+  NavigationEntry* active_entry =
+      tab->tab_contents()->controller().GetActiveEntry();
   if (!active_entry) {
     // It appears to be possible to get here with no active entry. This seems
     // to be possible with an auth dialog, but I can't narrow down the
     // circumstances. If you hit this, file a bug with the steps you did and
     // assign it to me (sky).
     NOTREACHED();
     return;
   }
-  tab->UpdateHistoryPageTitle(*active_entry);
+  tab->history_tab_helper()->UpdateHistoryPageTitle(*active_entry);
 
   FaviconService* favicon_service =
       tab->profile()->GetFaviconService(Profile::EXPLICIT_ACCESS);
 
   if (favicon_service && active_entry->favicon().is_valid() &&
       !active_entry->favicon().bitmap().empty()) {
     std::vector<unsigned char> image_data;
     gfx::PNGCodec::EncodeBGRASkBitmap(active_entry->favicon().bitmap(), false,
                                       &image_data);
     favicon_service->SetFavicon(active_entry->url(),
@@ skipping 684 matching lines @@
       Source<NavigationController>(&preview_contents_->controller()));
 #endif
 
   registrar_.Add(
       this,
       NotificationType::NAV_ENTRY_COMMITTED,
       Source<NavigationController>(&preview_contents_->controller()));
 
   preview_contents_->tab_contents()->ShowContents();
 }