Do not discard selected tab

chrome/browser/ui/tabs/tab_strip_model.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/ui/tabs/tab_strip_model.h"
 
 #include <algorithm>
 #include <map>
 #include <string>
 
@@ skipping 199 matching lines @@
                           NULL /* site_instance */,
                           MSG_ROUTING_NONE,
                           NULL /* base_tab_contents */));
   TabContents* old_contents = GetContentsAt(index);
   // Copy over the state from the navigation controller so we preserve the
   // back/forward history and continue to display the correct title/favicon.
   null_contents->web_contents()->GetController().CopyStateFrom(
       old_contents->web_contents()->GetController());
   // Replace the tab we're discarding with the null version.
   ReplaceTabContentsAt(index, null_contents);
-  // Mark the tab so it will reload when we click.
-  contents_data_[index]->discarded = true;
+
+  // Only mark tabs that are not selected. When selected tab is discarded, it is

[sky, 2012/09/19 17:06:59]

Write a test for this.

[simonhong_, 2012/09/20 10:26:29]

This can be verified by OomProirotyManager::DiscardTab().
In this situation, TabStripModel::DiscardTabContentsAt() is not called because
last tab is marked true.
Does I make test in tab_strip_model_unittest.cc or
oom_priority_manager_unittest?
On 2012/09/19 17:06:59, sky wrote:

[sky, 2012/09/20 15:24:08]

Can't you call what OOMPriorityManager is invoking?
tab_strip_model_unittest since that where the fix is going.

[simonhong_, 2012/09/20 16:07:59]

Modified tab_strip_model_unittest.
And Added some test to oom_priority_mamanger_browsertest.
On 2012/09/20 15:24:08, sky wrote:

+  // the last tab. After discarding last tab, it is reloaded again. So, do not
+  // mark the tab. It is active tab.
+  if (!IsTabSelected(index)) {
+    // Mark the tab so it will reload when we click.
+    contents_data_[index]->discarded = true;
+  }
   // Discard the old tab's renderer.
   // TODO(jamescook): This breaks script connections with other tabs.
   // We need to find a different approach that doesn't do that, perhaps based
   // on navigation to swappedout://.
   delete old_contents;
   return null_contents;
 }
 
 TabContents* TabStripModel::DetachTabContentsAt(int index) {
   if (contents_data_.empty())
@@ skipping 1081 matching lines @@
 void TabStripModel::ForgetOpenersAndGroupsReferencing(
     const NavigationController* tab) {
   for (TabContentsDataVector::const_iterator i = contents_data_.begin();
        i != contents_data_.end(); ++i) {
     if ((*i)->group == tab)
       (*i)->group = NULL;
     if ((*i)->opener == tab)
       (*i)->opener = NULL;
   }
 }