RestoreTabHelper > SessionTabHelper, move more session stuff into it.

chrome/browser/extensions/extension_tab_id_map.cc

 // Copyright (c) 2012 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/sessions/session_tab_helper.h"
 #include "chrome/browser/tab_contents/retargeting_details.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_process_host.h"
@@ skipping 53 matching lines @@
         break;
       RenderViewHost* host = content::Details<RenderViewHost>(details).ptr();
       // TODO(mpcmoplete): How can we tell if window_id is bogus? It may not
       // have been set yet.
       BrowserThread::PostTask(
           BrowserThread::IO, FROM_HERE,
           base::Bind(
               &ExtensionTabIdMap::SetTabAndWindowId,
               base::Unretained(ExtensionTabIdMap::GetInstance()),
               host->GetProcess()->GetID(), host->GetRoutingID(),
-              tab->restore_tab_helper()->session_id().id(),
-              tab->restore_tab_helper()->window_id().id()));
+              tab->session_tab_helper()->session_id().id(),
+              tab->session_tab_helper()->window_id().id()));
       break;
     }
     case chrome::NOTIFICATION_TAB_PARENTED: {
       TabContents* tab =
           content::Source<TabContents>(source).ptr();
       RenderViewHost* host = tab->web_contents()->GetRenderViewHost();
       BrowserThread::PostTask(
           BrowserThread::IO, FROM_HERE,
           base::Bind(
               &ExtensionTabIdMap::SetTabAndWindowId,
               base::Unretained(ExtensionTabIdMap::GetInstance()),
               host->GetProcess()->GetID(), host->GetRoutingID(),
-              tab->restore_tab_helper()->session_id().id(),
-              tab->restore_tab_helper()->window_id().id()));
+              tab->session_tab_helper()->session_id().id(),
+              tab->session_tab_helper()->window_id().id()));
       break;
     }
     case chrome::NOTIFICATION_RETARGETING: {
       RetargetingDetails* retargeting_details =
           content::Details<RetargetingDetails>(details).ptr();
       WebContents* contents = retargeting_details->target_web_contents;
       TabContents* tab = TabContents::FromWebContents(contents);
       if (!tab)
         break;
       RenderViewHost* host = contents->GetRenderViewHost();
       BrowserThread::PostTask(
           BrowserThread::IO, FROM_HERE,
           base::Bind(
               &ExtensionTabIdMap::SetTabAndWindowId,
               base::Unretained(ExtensionTabIdMap::GetInstance()),
               host->GetProcess()->GetID(), host->GetRoutingID(),
-              tab->restore_tab_helper()->session_id().id(),
-              tab->restore_tab_helper()->window_id().id()));
+              tab->session_tab_helper()->session_id().id(),
+              tab->session_tab_helper()->window_id().id()));
       break;
     }
     case content::NOTIFICATION_RENDER_VIEW_HOST_DELETED: {
       RenderViewHost* host = content::Source<RenderViewHost>(source).ptr();
       BrowserThread::PostTask(
           BrowserThread::IO, FROM_HERE,
           base::Bind(
               &ExtensionTabIdMap::ClearTabAndWindowId,
               base::Unretained(ExtensionTabIdMap::GetInstance()),
               host->GetProcess()->GetID(), host->GetRoutingID()));
@@ skipping 47 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;
 }