Get rid of extensions dependency from content\browser.

chrome/browser/ui/views/tabs/browser_tab_strip_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/ui/views/tabs/browser_tab_strip_controller.h"
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
+#include "chrome/browser/extensions/extension_tab_helper.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/tabs/tab_menu_model.h"
 #include "chrome/browser/ui/views/tabs/base_tab_strip.h"
 #include "chrome/browser/ui/views/tabs/tab_renderer_data.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/renderer_host/render_view_host.h"
@@ skipping 362 matching lines @@
   TabRendererData data;
   SetTabRendererDataFromModel(contents->tab_contents(), model_index, &data);
   tabstrip_->SetTabData(model_index, data);
 }
 
 void BrowserTabStripController::SetTabRendererDataFromModel(
     TabContents* contents,
     int model_index,
     TabRendererData* data) {
   SkBitmap* app_icon = NULL;
+  TabContentsWrapper* wrapper =
+      TabContentsWrapper::GetCurrentWrapperForContents(contents);
 
   // Extension App icons are slightly larger than favicons, so only allow
   // them if permitted by the model.
   if (model_->delegate()->LargeIconsPermitted())
-    app_icon = contents->GetExtensionAppIcon();
+    app_icon = wrapper->extension_tab_helper()->GetExtensionAppIcon();
 
   if (app_icon)
     data->favicon = *app_icon;
   else
     data->favicon = contents->GetFavicon();
   data->network_state = TabContentsNetworkState(contents);
   data->title = contents->GetTitle();
   data->loading = contents->is_loading();
   data->crashed_status = contents->crashed_status();
   data->incognito = contents->profile()->IsOffTheRecord();
   data->show_icon = contents->ShouldDisplayFavicon();
   data->mini = model_->IsMiniTab(model_index);
   data->blocked = model_->IsTabBlocked(model_index);
-  data->app = contents->is_app();
+  data->app = wrapper->extension_tab_helper()->is_app();
 }
 
 void BrowserTabStripController::StartHighlightTabsForCommand(
     TabStripModel::ContextMenuCommand command_id,
     BaseTab* tab) {
   if (command_id == TabStripModel::CommandCloseOtherTabs ||
       command_id == TabStripModel::CommandCloseTabsToRight) {
     int model_index = tabstrip_->GetModelIndexOfBaseTab(tab);
     if (IsValidIndex(model_index)) {
       std::vector<int> indices =
@@ skipping 24 matching lines @@
   DCHECK(type.value == NotificationType::TAB_CLOSEABLE_STATE_CHANGED);
   // Note that this notification may be fired during a model mutation and
   // possibly before the tabstrip has processed the change.
   // Here, we just re-layout each existing tab to reflect the change in its
   // closeable state, and then schedule paint for entire tabstrip.
   for (int i = 0; i < tabstrip_->tab_count(); ++i) {
     tabstrip_->base_tab_at_tab_index(i)->Layout();
   }
   tabstrip_->SchedulePaint();
 }