Move session_id.{cc,h} from chrome/browser/sessions to components/sessions

chrome/browser/extensions/activity_log/uma_policy.cc

 // Copyright 2013 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/activity_log/uma_policy.h"
 
 #include "base/metrics/histogram.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/active_script_controller.h"
 #include "chrome/browser/extensions/activity_log/activity_action_constants.h"
 #include "chrome/browser/extensions/activity_log/ad_network_database.h"
-#include "chrome/browser/sessions/session_id.h"
+#include "chrome/browser/sessions/session_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/url_constants.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/common/dom_action_types.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest.h"
@@ skipping 285 matching lines @@
     return;
   browser->tab_strip_model()->AddObserver(this);
 }
 
 void UmaPolicy::OnBrowserRemoved(Browser* browser) {
   if (!profile_->IsSameProfile(browser->profile()))
     return;
   browser->tab_strip_model()->RemoveObserver(this);
 }
 
-// Use the value from SessionID::IdForTab, *not* |index|. |index| will be
+// Use the value from SessionTabHelper::IdForTab, *not* |index|. |index| will be
 // duplicated across tabs in a session, whereas IdForTab uniquely identifies
 // each tab.
 void UmaPolicy::TabChangedAt(content::WebContents* contents,
                              int index,
                              TabChangeType change_type) {
   if (change_type != TabStripModelObserver::LOADING_ONLY)
     return;
   if (!contents)
     return;
 
   std::string url = CleanURL(contents->GetLastCommittedURL());
-  int32 tab_id = SessionID::IdForTab(contents);
+  int32 tab_id = SessionTabHelper::IdForTab(contents);
 
   std::map<int32, std::string>::iterator tab_it = tab_list_.find(tab_id);
 
   // Ignore tabs that haven't changed status.
   if (tab_it != tab_list_.end() && tab_it->second == url)
     return;
 
   // Is this an existing tab whose URL has changed.
   if (tab_it != tab_list_.end()) {
     CleanupClosedPage(tab_it->second, contents);
     tab_list_.erase(tab_id);
   }
 
   // Check that tab_list_ isn't over the kMaxTabsTracked budget.
   if (tab_list_.size() >= kMaxTabsTracked)
     return;
 
   // Set up the new entries.
   tab_list_[tab_id] = url;
   SetupOpenedPage(url);
 }
 
-// Use the value from SessionID::IdForTab, *not* |index|. |index| will be
+// Use the value from SessionTabHelper::IdForTab, *not* |index|. |index| will be
 // duplicated across tabs in a session, whereas IdForTab uniquely identifies
 // each tab.
 void UmaPolicy::TabClosingAt(TabStripModel* tab_strip_model,
                              content::WebContents* contents,
                              int index) {
   if (!contents)
     return;
   std::string url = CleanURL(contents->GetLastCommittedURL());
-  int32 tab_id = SessionID::IdForTab(contents);
+  int32 tab_id = SessionTabHelper::IdForTab(contents);
   std::map<int, std::string>::iterator tab_it = tab_list_.find(tab_id);
   if (tab_it != tab_list_.end())
     tab_list_.erase(tab_id);
 
   CleanupClosedPage(url, contents);
 }
 
 void UmaPolicy::SetupOpenedPage(const std::string& url) {
   url_status_[url][kNumberOfTabs]++;
 }
@@ skipping 76 matching lines @@
       return "AdLikelyReplaced";
     case NONE:
     case MAX_STATUS:
     default:
       NOTREACHED();
       return "";
   }
 }
 
 }  // namespace extensions