Clean up TCW, make it solely a hub for 1:1 observer/helper objects.

chrome/browser/alternate_nav_url_fetcher.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/alternate_nav_url_fetcher.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/intranet_redirect_detector.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/link_infobar_delegate.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_notification_types.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/public/browser/notification_service.h"
 #include "content/public/common/url_fetcher.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "net/base/registry_controlled_domain.h"
 #include "net/url_request/url_request.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 // AlternateNavInfoBarDelegate ------------------------------------------------
@@ skipping 98 matching lines @@
         registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
                        content::Source<NavigationController>(controller));
         StartFetch(controller);
       }
       break;
     }
 
     case chrome::NOTIFICATION_INSTANT_COMMITTED: {
       // See above.
       NavigationController* controller =
-          &content::Source<TabContentsWrapper>(source)->controller();
+          &content::Source<TabContentsWrapper>(source)->
+              tab_contents()->controller();
       if (controller_ == controller) {
         delete this;
       } else if (!controller_) {
         navigated_to_entry_ = true;
         StartFetch(controller);
       }
       break;
     }
 
     case content::NOTIFICATION_NAV_ENTRY_COMMITTED:
@@ skipping 72 matching lines @@
     return;
   }
 
   InfoBarTabHelper* infobar_helper =
       TabContentsWrapper::GetCurrentWrapperForContents(
           controller_->tab_contents())->infobar_tab_helper();
   infobar_helper->AddInfoBar(
       new AlternateNavInfoBarDelegate(infobar_helper, alternate_nav_url_));
   delete this;
 }