Take 2 at this. The only change between this and the first is to add the GetT...

chrome/browser/sessions/session_service_unittest.cc

 // Copyright (c) 2006-2008 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 "base/file_util.h"
 #include "base/path_service.h"
 #include "base/scoped_ptr.h"
 #include "base/scoped_vector.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
@@ skipping 379 matching lines @@
   ASSERT_EQ(window_id.id(), windows[0]->window_id.id());
   ASSERT_EQ(1U, windows[0]->tabs.size());
 
   SessionTab* tab = windows[0]->tabs[0];
   helper_.AssertTabEquals(window_id, tab_id, 0, 0, 1, *tab);
   helper_.AssertNavigationEquals(nav1, tab->navigations[0]);
 }
 
 // Makes sure we don't track popups.
 TEST_F(SessionServiceTest, IgnorePopups) {
+  if (browser_defaults::kRestorePopups)
+    return;  // This test is only applicable if popups aren't restored.
+
   SessionID window2_id;
   SessionID tab_id;
   SessionID tab2_id;
   ASSERT_NE(window2_id.id(), window_id.id());
 
   service()->SetWindowType(window2_id, Browser::TYPE_POPUP);
   service()->SetWindowBounds(window2_id, window_bounds, false);
 
   TabNavigation nav1(0, GURL("http://google.com"), GURL(),
                      ASCIIToUTF16("abc"), "def",
@@ skipping 14 matching lines @@
   ASSERT_EQ(1U, windows->size());
   ASSERT_EQ(0, windows[0]->selected_tab_index);
   ASSERT_EQ(window_id.id(), windows[0]->window_id.id());
   ASSERT_EQ(1U, windows[0]->tabs.size());
 
   SessionTab* tab = windows[0]->tabs[0];
   helper_.AssertTabEquals(window_id, tab_id, 0, 0, 1, *tab);
   helper_.AssertNavigationEquals(nav1, tab->navigations[0]);
 }
 
+// Makes sure we track popups.
+TEST_F(SessionServiceTest, RestorePopup) {
+  if (!browser_defaults::kRestorePopups)
+    return;  // This test is only applicable if popups are restored.
+
+  SessionID window2_id;
+  SessionID tab_id;
+  SessionID tab2_id;
+  ASSERT_NE(window2_id.id(), window_id.id());
+
+  service()->SetWindowType(window2_id, Browser::TYPE_POPUP);
+  service()->SetWindowBounds(window2_id, window_bounds, false);
+
+  TabNavigation nav1(0, GURL("http://google.com"), GURL(),
+                     ASCIIToUTF16("abc"), "def",
+                     PageTransition::QUALIFIER_MASK);
+  TabNavigation nav2(0, GURL("http://google2.com"), GURL(),
+                     ASCIIToUTF16("abcd"), "defg",
+                     PageTransition::AUTO_BOOKMARK);
+
+  helper_.PrepareTabInWindow(window_id, tab_id, 0, true);
+  UpdateNavigation(window_id, tab_id, nav1, 0, true);
+
+  helper_.PrepareTabInWindow(window2_id, tab2_id, 0, false);
+  UpdateNavigation(window2_id, tab2_id, nav2, 0, true);
+
+  ScopedVector<SessionWindow> windows;
+  ReadWindows(&(windows.get()));
+
+  ASSERT_EQ(2U, windows->size());
+  int normal_index = windows[0]->type == Browser::TYPE_NORMAL ?
+      0 : 1;
+  int popup_index = normal_index == 0 ? 1 : 0;
+  ASSERT_EQ(0, windows[normal_index]->selected_tab_index);
+  ASSERT_EQ(window_id.id(), windows[normal_index]->window_id.id());
+  ASSERT_EQ(1U, windows[normal_index]->tabs.size());
+
+  SessionTab* tab = windows[normal_index]->tabs[0];
+  helper_.AssertTabEquals(window_id, tab_id, 0, 0, 1, *tab);
+  helper_.AssertNavigationEquals(nav1, tab->navigations[0]);
+
+  ASSERT_EQ(0, windows[popup_index]->selected_tab_index);
+  ASSERT_EQ(window2_id.id(), windows[popup_index]->window_id.id());
+  ASSERT_EQ(1U, windows[popup_index]->tabs.size());
+
+  tab = windows[popup_index]->tabs[0];
+  helper_.AssertTabEquals(window2_id, tab2_id, 0, 0, 1, *tab);
+  helper_.AssertNavigationEquals(nav2, tab->navigations[0]);
+}
+
 // Tests pruning from the front.
 TEST_F(SessionServiceTest, PruneFromFront) {
   const std::string base_url("http://google.com/");
   SessionID tab_id;
 
   helper_.PrepareTabInWindow(window_id, tab_id, 0, true);
 
   // Add 5 navigations, with the 4th selected.
   for (int i = 0; i < 5; ++i) {
     TabNavigation nav(0, GURL(base_url + IntToString(i)), GURL(),
@@ skipping 53 matching lines @@
 
 // Explicitly set the pinned state to false and make sure we get back false.
 TEST_F(SessionServiceTest, PinnedFalseWhenSetToFalse) {
   EXPECT_FALSE(CreateAndWriteSessionWithOneTab(false, true));
 }
 
 // Explicitly set the pinned state to false and make sure we get back true.
 TEST_F(SessionServiceTest, PinnedTrue) {
   EXPECT_TRUE(CreateAndWriteSessionWithOneTab(true, true));
 }