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

chrome/browser/sessions/restore_tab_helper.cc

Index: chrome/browser/sessions/restore_tab_helper.cc
diff --git a/chrome/browser/sessions/restore_tab_helper.cc b/chrome/browser/sessions/restore_tab_helper.cc
index 074991e4f1901ef58399d0de4f7862e8077ea754..6516731a7a7178392bc03b4be6271aa64a1585ae 100644
--- a/chrome/browser/sessions/restore_tab_helper.cc
+++ b/chrome/browser/sessions/restore_tab_helper.cc
@@ -7,6 +7,7 @@
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/extensions/extension_messages.h"
 #include "content/browser/renderer_host/render_view_host.h"
+#include "content/browser/tab_contents/tab_contents.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 
@@ -27,8 +28,9 @@ void RestoreTabHelper::SetWindowID(const SessionID& id) {
 
   // Extension code in the renderer holds the ID of the window that hosts it.
   // Notify it that the window ID changed.
-  tab_->render_view_host()->Send(new ExtensionMsg_UpdateBrowserWindowId(
-      tab_->render_view_host()->routing_id(), id.id()));
+  tab_->tab_contents()->render_view_host()->Send(
+      new ExtensionMsg_UpdateBrowserWindowId(
+          tab_->tab_contents()->render_view_host()->routing_id(), id.id()));
 }
 
 void RestoreTabHelper::RenderViewCreated(RenderViewHost* render_view_host) {