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

chrome/browser/automation/automation_provider_observers.cc

Index: chrome/browser/automation/automation_provider_observers.cc
diff --git a/chrome/browser/automation/automation_provider_observers.cc b/chrome/browser/automation/automation_provider_observers.cc
index 670d01e09e221292b9301836d6f92958a3a74e61..dc6c4fdf10ffbd468ee18a2beca9dde3a9d60494 100644
--- a/chrome/browser/automation/automation_provider_observers.cc
+++ b/chrome/browser/automation/automation_provider_observers.cc
@@ -389,8 +389,8 @@ void TabStripNotificationObserver::Observe(
     const content::NotificationDetails& details) {
   if (type == notification_) {
     if (type == content::NOTIFICATION_TAB_PARENTED) {
-      ObserveTab(
-          &(content::Source<TabContentsWrapper>(source).ptr()->controller()));
+      ObserveTab(&(content::Source<TabContentsWrapper>(source).ptr()->
+                     tab_contents()->controller()));
     } else {
       ObserveTab(content::Source<NavigationController>(source).ptr());
     }
@@ -2748,7 +2748,8 @@ void NewTabObserver::Observe(int type,
                              const content::NotificationDetails& details) {
   DCHECK_EQ(content::NOTIFICATION_TAB_PARENTED, type);
   NavigationController* controller =
-      &(content::Source<TabContentsWrapper>(source).ptr()->controller());
+      &(content::Source<TabContentsWrapper>(source).ptr()->
+          tab_contents()->controller());
   if (automation_) {
     // TODO(phajdan.jr): Clean up this hack. We write the correct return type
     // here, but don't send the message. NavigationNotificationObserver