Sessions API - previously Session Restore API. Supports restoring currently open foreign windows an…

chrome/browser/extensions/api/sessions/session_id.cc

Index: chrome/browser/extensions/api/sessions/session_id.cc
diff --git a/chrome/browser/extensions/webstore_installer_unittest.cc b/chrome/browser/extensions/api/sessions/session_id.cc
similarity index 18%
copy from chrome/browser/extensions/webstore_installer_unittest.cc
copy to chrome/browser/extensions/api/sessions/session_id.cc
index f81ec4437b621859af3e04db4b21ebbb09004dbf..0b0b6d0ad1763a084378321a4cd701ab7449f1fc 100644
--- a/chrome/browser/extensions/webstore_installer_unittest.cc
+++ b/chrome/browser/extensions/api/sessions/session_id.cc
@@ -2,34 +2,48 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <string>
+#include "chrome/browser/extensions/api/sessions/session_id.h"
 
+#include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
-#include "chrome/browser/extensions/webstore_installer.h"
-#include "chrome/common/omaha_query_params/omaha_query_params.h"
-#include "extensions/common/id_util.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-using base::StringPrintf;
-using chrome::OmahaQueryParams;
 
 namespace extensions {
 
-// Returns true if |target| is found in |source|.
-bool Contains(const std::string& source, const std::string& target) {
-  return source.find(target) != std::string::npos;
+const char kIdSeparator = '.';
+
+// static
+scoped_ptr<SessionId> SessionId::Parse(const std::string& session_id) {
+  std::string session_tag;
+
+  // Populate session_tag if the |session_id| represents a foreign SessionId.
+  std::size_t separator = session_id.find(kIdSeparator);
+  if (separator != std::string::npos) {
+    session_tag = session_id.substr(0, separator);
+  }
+
+  // session_tag will be the empty string for local sessions that have only
+  // a unique integer as the identifier.
+  int id;
+  if (!base::StringToInt(
+      session_tag.empty() ? session_id : session_id.substr(separator + 1),
+      &id)) {
+    return scoped_ptr<SessionId>();
+  }
+  return make_scoped_ptr(new SessionId(session_tag, id));
+}
+
+SessionId::SessionId(const std::string& session_tag, int id)
+    : session_tag_(session_tag), id_(id) {
 }
 
-TEST(WebstoreInstallerTest, PlatformParams) {
-  std::string id = extensions::id_util::GenerateId("some random string");
-  GURL url = WebstoreInstaller::GetWebstoreInstallURL(id, "");
-  std::string query = url.query();
-  EXPECT_TRUE(Contains(query,StringPrintf("os=%s", OmahaQueryParams::getOS())));
-  EXPECT_TRUE(Contains(query,StringPrintf("arch=%s",
-                                          OmahaQueryParams::getArch())));
-  EXPECT_TRUE(Contains(query,StringPrintf("nacl_arch=%s",
-                                          OmahaQueryParams::getNaclArch())));
+bool SessionId::IsForeign() const {
+  return !session_tag_.empty();
+}
 
+std::string SessionId::ToString() const {
+  return IsForeign() ?
+      (session_tag_ + kIdSeparator + base::StringPrintf("%d", id_))
+      : base::StringPrintf("%d", id_);
 }
 
 }  // namespace extensions