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

chrome/browser/ui/web_applications/web_app_ui.cc

Index: chrome/browser/ui/web_applications/web_app_ui.cc
diff --git a/chrome/browser/ui/web_applications/web_app_ui.cc b/chrome/browser/ui/web_applications/web_app_ui.cc
index 6a04d4f58812f935da72bda978b65406576a51a2..225fd85c58edbfec33af4a8aad6d35c61be3b849 100644
--- a/chrome/browser/ui/web_applications/web_app_ui.cc
+++ b/chrome/browser/ui/web_applications/web_app_ui.cc
@@ -101,8 +101,10 @@ UpdateShortcutWorker::UpdateShortcutWorker(TabContentsWrapper* tab_contents)
   file_name_ = web_app::internals::GetSanitizedFileName(shortcut_info_.title);
 
   registrar_.Add(
-      this, content::NOTIFICATION_TAB_CLOSING,
-      content::Source<NavigationController>(&tab_contents_->controller()));
+      this,
+      content::NOTIFICATION_TAB_CLOSING,
+      content::Source<NavigationController>(
+          &tab_contents_->tab_contents()->controller()));
 }
 
 void UpdateShortcutWorker::Run() {
@@ -116,7 +118,7 @@ void UpdateShortcutWorker::Observe(
     const content::NotificationDetails& details) {
   if (type == content::NOTIFICATION_TAB_CLOSING &&
       content::Source<NavigationController>(source).ptr() ==
-        &tab_contents_->controller()) {
+        &tab_contents_->tab_contents()->controller()) {
     // Underlying tab is closing.
     tab_contents_ = NULL;
   }