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

chrome/browser/extensions/active_tab_unittest.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 <string>
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/values.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/active_tab_permission_granter.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/sessions/session_id.h"
+#include "chrome/browser/sessions/session_tab_helper.h"
 #include "chrome/common/extensions/features/feature_channel.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/frame_navigate_params.h"
 #include "content/public/common/page_transition_types.h"
@@ skipping 51 matching lines @@
         extension_with_tab_capture(CreateTestExtension("cafebeef",
                                                        true,
                                                        true)) {}
 
   virtual void SetUp() OVERRIDE {
     ChromeRenderViewHostTestHarness::SetUp();
     TabHelper::CreateForWebContents(web_contents());
   }
 
   int tab_id() {
-    return SessionID::IdForTab(web_contents());
+    return SessionTabHelper::IdForTab(web_contents());
   }
 
   ActiveTabPermissionGranter* active_tab_permission_granter() {
     return extensions::TabHelper::FromWebContents(web_contents())->
         active_tab_permission_granter();
   }
 
   bool IsAllowed(const scoped_refptr<const Extension>& extension,
                  const GURL& url) {
     return IsAllowed(extension, url, PERMITTED_BOTH, tab_id());
@@ skipping 45 matching lines @@
 
   bool HasTabsPermission(const scoped_refptr<const Extension>& extension,
                          int tab_id) {
     return extension->permissions_data()->HasAPIPermissionForTab(
         tab_id, APIPermission::kTab);
   }
 
   bool IsGrantedForTab(const Extension* extension,
                        const content::WebContents* web_contents) {
     return extension->permissions_data()->HasAPIPermissionForTab(
-        SessionID::IdForTab(web_contents), APIPermission::kTab);
+        SessionTabHelper::IdForTab(web_contents), APIPermission::kTab);
   }
 
   // TODO(justinlin): Remove when tabCapture is moved to stable.
   ScopedCurrentChannel current_channel;
 
   // An extension with the activeTab permission.
   scoped_refptr<const Extension> extension;
 
   // Another extension with activeTab (for good measure).
   scoped_refptr<const Extension> another_extension;
@@ skipping 209 matching lines @@
   EXPECT_TRUE(permissions_data->HasAPIPermissionForTab(
       tab_id(), APIPermission::kTabCaptureForTab));
 
   EXPECT_TRUE(IsBlocked(extension_with_tab_capture, internal, tab_id() + 1));
   EXPECT_FALSE(permissions_data->HasAPIPermissionForTab(
       tab_id() + 1, APIPermission::kTabCaptureForTab));
 }
 
 }  // namespace
 }  // namespace extensions