Move blocked content from TabContents to TabContentsWrapper.

chrome/browser/instant/instant_controller.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_controller.h"
 
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "build/build_config.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/instant/instant_delegate.h"
 #include "chrome/browser/instant/instant_loader.h"
 #include "chrome/browser/instant/instant_loader_manager.h"
 #include "chrome/browser/instant/promo_counter.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_model.h"
+#include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/renderer_host/render_widget_host_view.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/notification_service.h"
 
 // Number of ms to delay between loading urls.
 static const int kUpdateDelayMS = 200;
@@ skipping 222 matching lines @@
   // If the loader was showing an instant page then it's navigation stack is
   // something like: search-engine-home-page (eg google.com) search-term1
   // search-term2 .... Each search-term navigation corresponds to the page
   // deciding enough time has passed to commit a navigation. We don't want the
   // searche-engine-home-page navigation in this case so we pass true to
   // CopyStateFromAndPrune to have the search-engine-home-page navigation
   // removed.
   tab->controller().CopyStateFromAndPrune(
       &tab_contents_->controller(), showing_instant);
   delegate_->CommitInstant(tab);
-  CompleteRelease(tab->tab_contents());
+  CompleteRelease(tab);
 }
 
 void InstantController::SetCommitOnMouseUp() {
   commit_on_mouse_up_ = true;
 }
 
 bool InstantController::IsMouseDownFromActivate() {
   DCHECK(loader_manager_.get());
   DCHECK(loader_manager_->current_loader());
   return loader_manager_->current_loader()->IsMouseDownFromActivate();
@@ skipping 101 matching lines @@
   is_active_ = false;
   displayable_loader_ = NULL;
   commit_on_mouse_up_ = false;
   omnibox_bounds_ = gfx::Rect();
   loader_manager_.reset();
   update_timer_.Stop();
   show_timer_.Stop();
   return tab;
 }
 
-void InstantController::CompleteRelease(TabContents* tab) {
-  tab->SetAllContentsBlocked(false);
+void InstantController::CompleteRelease(TabContentsWrapper* tab) {
+  tab->blocked_content_tab_helper()->SetAllContentsBlocked(false);
 }
 
 TabContentsWrapper* InstantController::GetPreviewContents() {
   return loader_manager_.get() && loader_manager_->current_loader() ?
       loader_manager_->current_loader()->preview_contents() : NULL;
 }
 
 bool InstantController::IsShowingInstant() {
   return loader_manager_.get() && loader_manager_->current_loader() &&
       loader_manager_->current_loader()->is_showing_instant();
@@ skipping 279 matching lines @@
     const AutocompleteMatch& match) {
   const TemplateURL* template_url = match.template_url;
   if (match.type == AutocompleteMatch::SEARCH_WHAT_YOU_TYPED ||
       match.type == AutocompleteMatch::SEARCH_HISTORY ||
       match.type == AutocompleteMatch::SEARCH_SUGGEST) {
     TemplateURLModel* model = tab_contents_->profile()->GetTemplateURLModel();
     template_url = model ? model->GetDefaultSearchProvider() : NULL;
   }
   return template_url;
 }