Refactoring of SessionService to get componentized.

chrome/browser/sessions/session_service_utils.cc

Index: chrome/browser/sessions/session_service_utils.cc
diff --git a/chrome/browser/sessions/session_service_utils.cc b/chrome/browser/sessions/session_service_utils.cc
new file mode 100644
index 0000000000000000000000000000000000000000..3f9c1300656b2828b7788675fcb1ffcd34e58e72
--- /dev/null
+++ b/chrome/browser/sessions/session_service_utils.cc
@@ -0,0 +1,48 @@
+// Copyright 2014 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/sessions/session_service_utils.h"
+
+bool ShouldRestoreWindowOfType(SessionWindow::WindowType window_type,

[sky, 2014/10/29 23:14:51]

AFAICT the ShouldRestore/RemoveUnusedRestoreWindows is only used in
SessionService. Is there a reason it needs to be here? If it's needed for tests
how about private static functions in SessionService that are friended (I'm
pretty sure the test helper is a friend already).

[Mr4D (OOO till 08-26), 2014/10/29 23:47:44]

Done.

+                               AppType app_type) {
+#if defined(OS_CHROMEOS)
+  // Restore app popups for ChromeOS alone.
+  if (window_type == SessionWindow::TYPE_POPUP && app_type == TYPE_APP)
+    return true;
+#endif
+
+  return window_type == SessionWindow::TYPE_TABBED;
+}
+
+void RemoveUnusedRestoreWindows(std::vector<SessionWindow*>* window_list) {
+  std::vector<SessionWindow*>::iterator i = window_list->begin();
+  while (i != window_list->end()) {
+    SessionWindow* window = *i;
+    if (!ShouldRestoreWindowOfType(window->type,
+                                   window->app_name.empty() ? TYPE_NORMAL :
+                                                              TYPE_APP)) {
+      window_list->erase(i);

[sky, 2014/10/29 23:14:51]

This leaks.

[Mr4D (OOO till 08-26), 2014/10/29 23:47:44]

Done.

+      i = window_list->begin();
+    }
+  }
+}
+
+SessionWindow::WindowType WindowTypeForBrowserType(Browser::Type type) {
+  switch (type) {
+    case Browser::TYPE_POPUP:
+      return SessionWindow::TYPE_POPUP;
+    case Browser::TYPE_TABBED:
+      return SessionWindow::TYPE_TABBED;
+  }
+  NOTREACHED();
+}
+
+Browser::Type BrowserTypeForWindowType(SessionWindow::WindowType type) {
+  switch (type) {
+    case SessionWindow::TYPE_POPUP:
+      return Browser::TYPE_POPUP;
+    case SessionWindow::TYPE_TABBED:
+      return Browser::TYPE_TABBED;
+  }
+}