Get rid of extensions dependency from content\browser.

chrome/browser/sessions/session_service.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/sessions/session_service.h"
 
 #include <algorithm>
 #include <limits>
 #include <set>
 #include <vector>
 
 #include "base/file_util.h"
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/pickle.h"
 #include "base/threading/thread.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_window.h"
+#include "chrome/browser/extensions/extension_tab_helper.h"
 #include "chrome/browser/prefs/session_startup_pref.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_backend.h"
 #include "chrome/browser/sessions/session_command.h"
 #include "chrome/browser/sessions/session_restore.h"
 #include "chrome/browser/sessions/session_types.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser_init.h"
+#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/extensions/extension.h"
 #include "content/browser/tab_contents/navigation_controller.h"
 #include "content/browser/tab_contents/navigation_entry.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/notification_details.h"
 #include "content/common/notification_service.h"
 
 #if defined(OS_MACOSX)
 #include "chrome/browser/app_controller_cppsafe_mac.h"
 #endif
@@ skipping 473 matching lines @@
 
       RestoreIfNecessary(std::vector<GURL>(), browser);
       SetWindowType(browser->session_id(), browser->type());
       break;
     }
 
     case NotificationType::TAB_PARENTED: {
       NavigationController* controller =
           Source<NavigationController>(source).ptr();
       SetTabWindow(controller->window_id(), controller->session_id());
-      if (controller->tab_contents()->extension_app()) {
+      TabContentsWrapper* wrapper =
+          TabContentsWrapper::GetCurrentWrapperForContents(
+              controller->tab_contents());
+      if (wrapper->extension_tab_helper()->extension_app()) {
         SetTabExtensionAppID(
             controller->window_id(),
             controller->session_id(),
-            controller->tab_contents()->extension_app()->id());
+            wrapper->extension_tab_helper()->extension_app()->id());
       }
       break;
     }
 
     case NotificationType::TAB_CLOSED: {
       NavigationController* controller =
           Source<NavigationController>(source).ptr();
       TabClosed(controller->window_id(), controller->session_id(),
                 controller->tab_contents()->closed_by_user_gesture());
       RecordSessionUpdateHistogramData(NotificationType::TAB_CLOSED,
@@ skipping 41 matching lines @@
       Details<NavigationController::LoadCommittedDetails> changed(details);
       if (changed->type == NavigationType::NEW_PAGE ||
         changed->type == NavigationType::EXISTING_PAGE) {
         RecordSessionUpdateHistogramData(NotificationType::NAV_ENTRY_COMMITTED,
             &last_updated_nav_entry_commit_time_);
       }
       break;
     }
 
     case NotificationType::TAB_CONTENTS_APPLICATION_EXTENSION_CHANGED: {
-      TabContents* tab_contents = Source<TabContents>(source).ptr();
-      DCHECK(tab_contents);
-      if (tab_contents->extension_app()) {
-        SetTabExtensionAppID(tab_contents->controller().window_id(),
-                             tab_contents->controller().session_id(),
-                             tab_contents->extension_app()->id());
+      ExtensionTabHelper* extension_tab_helper =
+          Source<ExtensionTabHelper>(source).ptr();
+      if (extension_tab_helper->extension_app()) {
+        SetTabExtensionAppID(
+            extension_tab_helper->tab_contents()->controller().window_id(),
+            extension_tab_helper->tab_contents()->controller().session_id(),
+            extension_tab_helper->extension_app()->id());
       }
       break;
     }
 
     default:
       NOTREACHED();
   }
 }
 
 void SessionService::SetTabExtensionAppID(
@@ skipping 462 matching lines @@
                                  controller->entry_count());
   const int pending_index = controller->pending_entry_index();
   if (tab_to_available_range) {
     (*tab_to_available_range)[controller->session_id().id()] =
         std::pair<int, int>(min_index, max_index);
   }
   if (is_pinned) {
     commands->push_back(
         CreatePinnedStateCommand(controller->session_id(), true));
   }
-  if (controller->tab_contents()->extension_app()) {
+  TabContentsWrapper* wrapper =
+      TabContentsWrapper::GetCurrentWrapperForContents(
+          controller->tab_contents());
+  if (wrapper->extension_tab_helper()->extension_app()) {
     commands->push_back(
         CreateSetTabExtensionAppIDCommand(
             kCommandSetExtensionAppID,
             controller->session_id().id(),
-            controller->tab_contents()->extension_app()->id()));
+            wrapper->extension_tab_helper()->extension_app()->id()));
   }
   for (int i = min_index; i < max_index; ++i) {
     const NavigationEntry* entry = (i == pending_index) ?
         controller->pending_entry() : controller->GetEntryAtIndex(i);
     DCHECK(entry);
     if (ShouldTrackEntry(*entry)) {
       commands->push_back(
           CreateUpdateTabNavigationCommand(kCommandUpdateTabNavigation,
                                            controller->session_id().id(),
                                            i,
@@ skipping 373 matching lines @@
       50);
   if (use_long_period) {
     std::string long_name_("SessionRestore.SaveLongPeriod");
     UMA_HISTOGRAM_CUSTOM_TIMES(long_name_,
         delta,
         save_delay_in_mins_,
         save_delay_in_hrs_,
         50);
   }
 }