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

chrome/browser/extensions/extension_tab_id_map.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/extensions/extension_tab_id_map.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "chrome/browser/sessions/restore_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
@@ skipping 64 matching lines @@
               &ExtensionTabIdMap::SetTabAndWindowId,
               base::Unretained(ExtensionTabIdMap::GetInstance()),
               host->process()->GetID(), host->routing_id(),
               tab->restore_tab_helper()->session_id().id(),
               tab->restore_tab_helper()->window_id().id()));
       break;
     }
     case content::NOTIFICATION_TAB_PARENTED: {
       TabContentsWrapper* tab =
           content::Source<TabContentsWrapper>(source).ptr();
-      RenderViewHost* host = tab->render_view_host();
+      RenderViewHost* host = tab->tab_contents()->render_view_host();
       BrowserThread::PostTask(
           BrowserThread::IO, FROM_HERE,
           base::Bind(
               &ExtensionTabIdMap::SetTabAndWindowId,
               base::Unretained(ExtensionTabIdMap::GetInstance()),
               host->process()->GetID(), host->routing_id(),
               tab->restore_tab_helper()->session_id().id(),
               tab->restore_tab_helper()->window_id().id()));
       break;
     }
     case content::NOTIFICATION_RETARGETING: {
       content::RetargetingDetails* retargeting_details =
           content::Details<content::RetargetingDetails>(details).ptr();
       TabContents* contents = retargeting_details->target_tab_contents;
       TabContentsWrapper* tab =
           TabContentsWrapper::GetCurrentWrapperForContents(contents);
       if (!tab)
         break;
-      RenderViewHost* host = tab->render_view_host();
+      RenderViewHost* host = tab->tab_contents()->render_view_host();
       BrowserThread::PostTask(
           BrowserThread::IO, FROM_HERE,
           base::Bind(
               &ExtensionTabIdMap::SetTabAndWindowId,
               base::Unretained(ExtensionTabIdMap::GetInstance()),
               host->process()->GetID(), host->routing_id(),
               tab->restore_tab_helper()->session_id().id(),
               tab->restore_tab_helper()->window_id().id()));
       break;
     }
@@ skipping 55 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   RenderId render_id(render_process_host_id, routing_id);
   TabAndWindowIdMap::iterator iter = map_.find(render_id);
   if (iter != map_.end()) {
     *tab_id = iter->second.first;
     *window_id = iter->second.second;
     return true;
   }
   return false;
 }