retry r112077 - recently closed menu: respect middle click

chrome/browser/sessions/session_restore_browsertest.cc

 // Copyright (c) 2011 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_path.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
 #include "chrome/browser/sessions/tab_restore_service_factory.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
@@ skipping 140 matching lines @@
       static_cast<TabRestoreService::Window*>(service->entries().front());
   EXPECT_EQ(3U, window->tabs.size());
 
   // Find the SessionID for entry2. Since the session service was destroyed,
   // there is no guarantee that the SessionID for the tab has remained the same.
   std::vector<TabRestoreService::Tab>::const_iterator it = window->tabs.begin();
   for ( ; it != window->tabs.end(); ++it) {
     const TabRestoreService::Tab& tab = *it;
     // If this tab held url2, then restore this single tab.
     if (tab.navigations[0].virtual_url() == url2) {
-      service->RestoreEntryById(NULL, tab.id, false);
+      service->RestoreEntryById(NULL, tab.id, UNKNOWN);
       break;
     }
   }
 
   // Make sure that the Window got updated.
   EXPECT_EQ(1U, service->entries().size());
   ASSERT_EQ(TabRestoreService::WINDOW, service->entries().front()->type);
   window = static_cast<TabRestoreService::Window*>(service->entries().front());
   EXPECT_EQ(2U, window->tabs.size());
 }
@@ skipping 14 matching lines @@
   // Close the window.
   browser()->window()->Close();
 
   // Expect the window to be converted to a tab by the TRS.
   EXPECT_EQ(1U, service->entries().size());
   ASSERT_EQ(TabRestoreService::TAB, service->entries().front()->type);
   const TabRestoreService::Tab* tab =
       static_cast<TabRestoreService::Tab*>(service->entries().front());
 
   // Restore the tab.
-  service->RestoreEntryById(NULL, tab->id, false);
+  service->RestoreEntryById(NULL, tab->id, UNKNOWN);
 
   // Make sure the restore was successful.
   EXPECT_EQ(0U, service->entries().size());
 }
 
 // Verifies we remember the last browser window when closing the last
 // non-incognito window while an incognito window is open.
 IN_PROC_BROWSER_TEST_F(SessionRestoreTest, IncognitotoNonIncognito) {
   // Turn on session restore.
   SessionStartupPref pref(SessionStartupPref::LAST);
@@ skipping 20 matching lines @@
   }
 
   // Create a new window, which should trigger session restore.
   incognito_browser->NewWindow();
 
   // The first tab should have 'url' as its url.
   Browser* new_browser = ui_test_utils::WaitForNewBrowser();
   ASSERT_TRUE(new_browser);
   EXPECT_EQ(url, new_browser->GetTabContentsAt(0)->GetURL());
 }