Do not discard selected tab

chrome/browser/chromeos/oom_priority_manager_browsertest.cc

 // Copyright (c) 2012 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/browser_process.h"
 #include "chrome/browser/chromeos/oom_priority_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/find_bar/find_bar_controller.h"
@@ skipping 74 matching lines @@
   EXPECT_FALSE(browser()->tab_strip_model()->IsTabDiscarded(1));
   EXPECT_FALSE(browser()->tab_strip_model()->IsTabDiscarded(2));
 
   // Run discard again, make sure it kills the second tab.
   g_browser_process->oom_priority_manager()->DiscardTab();
   EXPECT_EQ(3, browser()->tab_count());
   EXPECT_TRUE(browser()->tab_strip_model()->IsTabDiscarded(0));
   EXPECT_TRUE(browser()->tab_strip_model()->IsTabDiscarded(1));
   EXPECT_FALSE(browser()->tab_strip_model()->IsTabDiscarded(2));
 
-  // Kill the third tab
+  // Kill the third tab. This tab is not marked becuase it will be reloaded.
   EXPECT_TRUE(g_browser_process->oom_priority_manager()->DiscardTab());
   EXPECT_TRUE(browser()->tab_strip_model()->IsTabDiscarded(0));
   EXPECT_TRUE(browser()->tab_strip_model()->IsTabDiscarded(1));
-  EXPECT_TRUE(browser()->tab_strip_model()->IsTabDiscarded(2));
+  EXPECT_FALSE(browser()->tab_strip_model()->IsTabDiscarded(2));
+  EXPECT_EQ(2, browser()->active_index());
 
-  // Running when all tabs are discarded should do nothing.
-  EXPECT_FALSE(g_browser_process->oom_priority_manager()->DiscardTab());
+  // Kill the third tab again, make sure last tab can be killed and be reloaded
+  // again.
+  EXPECT_TRUE(g_browser_process->oom_priority_manager()->DiscardTab());
+  EXPECT_FALSE(browser()->tab_strip_model()->IsTabDiscarded(2));
+  EXPECT_EQ(2, browser()->active_index());
 
   // Force creation of the FindBarController.
   browser()->GetFindBarController();
 
   // Select the first tab.  It should reload.
   WindowedNotificationObserver reload1(
       content::NOTIFICATION_NAV_ENTRY_COMMITTED,
       content::NotificationService::AllSources());
   chrome::SelectNumberedTab(browser(), 0);
   reload1.Wait();
   // Make sure the FindBarController gets the right TabContents.
   EXPECT_EQ(browser()->GetFindBarController()->tab_contents(),
             chrome::GetActiveTabContents(browser()));
   EXPECT_EQ(0, browser()->active_index());
   EXPECT_FALSE(browser()->tab_strip_model()->IsTabDiscarded(0));
   EXPECT_TRUE(browser()->tab_strip_model()->IsTabDiscarded(1));
-  EXPECT_TRUE(browser()->tab_strip_model()->IsTabDiscarded(2));
+  EXPECT_FALSE(browser()->tab_strip_model()->IsTabDiscarded(2));
 
   // Select the third tab. It should reload.
   WindowedNotificationObserver reload2(
       content::NOTIFICATION_NAV_ENTRY_COMMITTED,
       content::NotificationService::AllSources());
   chrome::SelectNumberedTab(browser(), 2);
   reload2.Wait();
   EXPECT_EQ(2, browser()->active_index());
   EXPECT_FALSE(browser()->tab_strip_model()->IsTabDiscarded(0));
   EXPECT_TRUE(browser()->tab_strip_model()->IsTabDiscarded(1));
@@ skipping 13 matching lines @@
   WindowedNotificationObserver back2(
       content::NOTIFICATION_NAV_ENTRY_COMMITTED,
       content::NotificationService::AllSources());
   chrome::GoBack(browser(), CURRENT_TAB);
   back2.Wait();
   EXPECT_FALSE(chrome::CanGoBack(browser()));
   EXPECT_TRUE(chrome::CanGoForward(browser()));
 }
 
 }  // namespace