sessions: moves SessionTabHelper to components/sessions
This way WebLayer can use it.
ENABLE_SESSION_SERVICE case is handled in chrome side by supplying
a null SessionService if ENABLE_SESSION_SERVICE is false.
BUG=1033924
TEST=none
Change-Id: I334274270d3e06e829d6f67e132467f0f8b9c73d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1999152
Commit-Queue: Scott Violet <[email protected]>
Reviewed-by: Reilly Grant <[email protected]>
Reviewed-by: Evan Stade <[email protected]>
Cr-Commit-Position: refs/heads/master@{#731620}
diff --git a/chrome/browser/extensions/chrome_extensions_browser_client.cc b/chrome/browser/extensions/chrome_extensions_browser_client.cc
index 2fa8227a..4261efcb 100644
--- a/chrome/browser/extensions/chrome_extensions_browser_client.cc
+++ b/chrome/browser/extensions/chrome_extensions_browser_client.cc
@@ -38,7 +38,6 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/renderer_host/chrome_navigation_ui_data.h"
-#include "chrome/browser/sessions/session_tab_helper.h"
#include "chrome/browser/task_manager/web_contents_tags.h"
#include "chrome/browser/ui/bluetooth/chrome_extension_bluetooth_chooser.h"
#include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h"
@@ -47,6 +46,7 @@
#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/url_constants.h"
+#include "components/sessions/content/session_tab_helper.h"
#include "components/update_client/update_client.h"
#include "components/version_info/version_info.h"
#include "content/public/browser/browser_thread.h"
@@ -471,8 +471,8 @@
content::WebContents* web_contents,
int* tab_id,
int* window_id) {
- SessionTabHelper* session_tab_helper =
- SessionTabHelper::FromWebContents(web_contents);
+ sessions::SessionTabHelper* session_tab_helper =
+ sessions::SessionTabHelper::FromWebContents(web_contents);
if (session_tab_helper) {
*tab_id = session_tab_helper->session_id().id();
*window_id = session_tab_helper->window_id().id();
