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

chrome/browser/extensions/extension_message_service.cc

Index: chrome/browser/extensions/extension_message_service.cc
diff --git a/chrome/browser/extensions/extension_message_service.cc b/chrome/browser/extensions/extension_message_service.cc
index 361c40883a9827581b89dd74355bd1d061c72533..9bf14026c7c6fff6e58a36aac9f0da33e1634705 100644
--- a/chrome/browser/extensions/extension_message_service.cc
+++ b/chrome/browser/extensions/extension_message_service.cc
@@ -194,11 +194,12 @@ void ExtensionMessageService::OpenChannelToTab(
   MessagePort receiver;
   if (ExtensionTabUtil::GetTabById(tab_id, profile, true,
                                    NULL, NULL, &contents, NULL)) {
-    receiver.sender = contents->render_view_host();
-    receiver.routing_id = contents->render_view_host()->routing_id();
+    receiver.sender = contents->tab_contents()->render_view_host();
+    receiver.routing_id =
+        contents->tab_contents()->render_view_host()->routing_id();
   }
 
-  if (contents && contents->controller().needs_reload()) {
+  if (contents && contents->tab_contents()->controller().needs_reload()) {
     // The tab isn't loaded yet. Don't attempt to connect. Treat this as a
     // disconnect.
     DispatchOnDisconnect(MessagePort(source, MSG_ROUTING_CONTROL),