Refactoring of SessionService to get componentized.

chrome/browser/sessions/session_types.cc

Index: chrome/browser/sessions/session_types.cc
diff --git a/chrome/browser/sessions/session_types.cc b/chrome/browser/sessions/session_types.cc
index a7ec0221734f1406ad8ae9e677de7d71c05663a1..b46ce45db5e6e39f7f884a5e1e680d290f95d14e 100644
--- a/chrome/browser/sessions/session_types.cc
+++ b/chrome/browser/sessions/session_types.cc
@@ -59,7 +59,7 @@ sync_pb::SessionTab SessionTab::ToSyncData() const {
 
 SessionWindow::SessionWindow()
     : selected_tab_index(-1),
-      type(Browser::TYPE_TABBED),
+      type(TYPE_TABBED),
       is_constrained(true),
       show_state(ui::SHOW_STATE_DEFAULT) {
 }
@@ -73,11 +73,13 @@ sync_pb::SessionWindow SessionWindow::ToSyncData() const {
   sync_data.set_window_id(window_id.id());
   sync_data.set_selected_tab_index(selected_tab_index);
   switch (type) {
-    case Browser::TYPE_TABBED:
+    case SessionWindow::TYPE_TABBED:
+      // TODO(skuhne): The sync data is currently using BrowserTypes and not
+      // WindowTypes. That should be changed.
       sync_data.set_browser_type(
           sync_pb::SessionWindow_BrowserType_TYPE_TABBED);
       break;
-    case Browser::TYPE_POPUP:
+    case SessionWindow::TYPE_POPUP:
       sync_data.set_browser_type(
         sync_pb::SessionWindow_BrowserType_TYPE_POPUP);
       break;